bitfinex-rb 0.0.11 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fda3167655ffc1362d2f7f96c6003850591aa48c
-  data.tar.gz: 8498e0b0d8b77f0a0395c8754370608649af2af5
+  metadata.gz: b1b2e7fdeb41e8d0de71ff3ab3a8c8f65b438f74
+  data.tar.gz: 5ee463c95bed54185d0ad7b0bd99c75c2ad461ee
 SHA512:
-  metadata.gz: 51db71bbf791120c209e0ab4ad9f8f14a39f7f5497ed1a714e4aeb71b90a7224c87934dba09225df06532da52da48d326ed61181c411471812007d7cc7312333
-  data.tar.gz: c97e21f78af8f0eb027f9699ef1b394584756314e6bdf7b8f09b0006c4afd0091cf89d18e19b6252c64e288fe3f441e96b17e0fd352b1f23014a11cdcbcdd07d
+  metadata.gz: a393e8688103054bd93c9b73799c96a8ff6a921155ad1064f12de83332d82c32c7e244153b0ffea1390232b9454761c323aebc35523715f02fd6318ae5f28932
+  data.tar.gz: d33751ff047447639cf5f2e7034e14e96b7dcf414984a1e72dde42a40e07c05aa2156ac0287653651f4b33c7452e8e27c485d30a8a5d5e2f590566fb17a75568

data/lib/bitfinex-rb.rb

@@ -0,0 +1 @@
+require_relative "./bitfinex.rb"

data/lib/bitfinex.rb

@@ -9,19 +9,30 @@ require 'bitfinex/errors'
 require 'bitfinex/connection'
 require 'bitfinex/websocket_connection'
 require 'bitfinex/authenticated_rest'
-require 'bitfinex/ticker'
-require 'bitfinex/trades'
-require 'bitfinex/funding_book'
-require 'bitfinex/orderbook'
-require 'bitfinex/lends'
-require 'bitfinex/symbols'
-require 'bitfinex/stats'
-require 'bitfinex/account_info'
-require 'bitfinex/deposit'
-require 'bitfinex/orders'
-require 'bitfinex/wallet'
-require 'bitfinex/positions'
-require 'bitfinex/historical_data'
-require 'bitfinex/margin_funding'
+require 'bitfinex/api_versions'
 require 'bitfinex/client'
 
+# API Version 1
+require 'bitfinex/v1/ticker'
+require 'bitfinex/v1/trades'
+require 'bitfinex/v1/funding_book'
+require 'bitfinex/v1/orderbook'
+require 'bitfinex/v1/lends'
+require 'bitfinex/v1/symbols'
+require 'bitfinex/v1/stats'
+require 'bitfinex/v1/account_info'
+require 'bitfinex/v1/deposit'
+require 'bitfinex/v1/orders'
+require 'bitfinex/v1/wallet'
+require 'bitfinex/v1/positions'
+require 'bitfinex/v1/historical_data'
+require 'bitfinex/v1/margin_funding'
+
+# API Version 2
+require 'bitfinex/v2/stats'
+require 'bitfinex/v2/ticker'
+require 'bitfinex/v2/utils'
+require 'bitfinex/v2/personal'
+require 'bitfinex/v2/trading'
+require 'bitfinex/v2/margin'
+

data/lib/bitfinex/api_versions.rb

@@ -0,0 +1,7 @@
+module Bitfinex
+  # API logic for Version 1
+  module V1; end
+
+  # API logic for Version 2
+  module V2; end
+end

data/lib/bitfinex/authenticated_rest.rb

@@ -5,27 +5,47 @@ module Bitfinex
     def authenticated_post(url, options = {})
       raise Bitfinex::InvalidAuthKeyError unless valid_key?
       complete_url = build_url(url)
-      payload = build_payload("/v1/#{url}", options[:params])
+      body = options[:params] || {}
+      nonce = new_nonce
+
+      payload = if config.api_version == 1
+        build_payload("/v1/#{url}", options[:params], nonce)
+      else
+        "/api#{complete_url}#{nonce}#{body.to_json}"
+      end
+
       response = rest_connection.post do |req|
         req.url complete_url
+        req.body = body.to_json
         req.options.timeout = config.rest_timeout
         req.options.open_timeout = config.rest_open_timeout
         req.headers['Content-Type'] = 'application/json'
         req.headers['Accept'] = 'application/json'
-        req.headers['X-BFX-PAYLOAD'] = payload
-        req.headers['X-BFX-SIGNATURE'] = sign(payload)
-        req.headers['X-BFX-APIKEY'] = config.api_key
+
+        if config.api_version == 1
+          req.headers['X-BFX-PAYLOAD'] = payload
+          req.headers['X-BFX-SIGNATURE'] = sign(payload)
+          req.headers['X-BFX-APIKEY'] = config.api_key
+        else
+          req.headers['bfx-nonce'] = nonce
+          req.headers['bfx-signature'] = sign(payload)
+          req.headers['bfx-apikey'] = config.api_key
+        end
       end
     end
 
-    def build_payload(url, params = {})
+    def build_payload(url, params = {}, nonce)
       payload = {}
-      payload['nonce'] = (Time.now.to_f * 10_000).to_i.to_s
+      payload['nonce'] = nonce
       payload['request'] = url
       payload.merge!(params) if params
       Base64.strict_encode64(payload.to_json)
     end
 
+    def new_nonce
+      (Time.now.to_f * 10_000).to_i.to_s
+    end
+
     def sign(payload)
       OpenSSL::HMAC.hexdigest('sha384', config.secret, payload)
     end

data/lib/bitfinex/client.rb

@@ -3,20 +3,36 @@ module Bitfinex
     include Bitfinex::RestConnection
     include Bitfinex::WebsocketConnection
     include Bitfinex::AuthenticatedConnection
-    include Bitfinex::TickerClient
-    include Bitfinex::TradesClient
-    include Bitfinex::FundingBookClient
-    include Bitfinex::OrderbookClient
-    include Bitfinex::StatsClient
-    include Bitfinex::LendsClient
-    include Bitfinex::SymbolsClient
-    include Bitfinex::AccountInfoClient
-    include Bitfinex::DepositClient
-    include Bitfinex::OrdersClient
-    include Bitfinex::PositionsClient
-    include Bitfinex::HistoricalDataClient
-    include Bitfinex::MarginFundingClient
-    include Bitfinex::WalletClient
     include Bitfinex::Configurable
+
+
+    def initialize
+      if config.api_version == 1
+        extend Bitfinex::V1::TickerClient
+        extend Bitfinex::V1::TradesClient
+        extend Bitfinex::V1::FundingBookClient
+        extend Bitfinex::V1::OrderbookClient
+        extend Bitfinex::V1::StatsClient
+        extend Bitfinex::V1::LendsClient
+        extend Bitfinex::V1::SymbolsClient
+        extend Bitfinex::V1::AccountInfoClient
+        extend Bitfinex::V1::DepositClient
+        extend Bitfinex::V1::OrdersClient
+        extend Bitfinex::V1::PositionsClient
+        extend Bitfinex::V1::HistoricalDataClient
+        extend Bitfinex::V1::MarginFundingClient
+        extend Bitfinex::V1::WalletClient
+      else
+        extend Bitfinex::V2::TickerClient
+        extend Bitfinex::V2::StatsClient
+        extend Bitfinex::V2::UtilsClient
+        extend Bitfinex::V2::PersonalClient
+        extend Bitfinex::V2::TradingClient
+        extend Bitfinex::V2::MarginClient
+      end
+
+      @mutex = Mutex.new
+      @c_counter = 1
+    end
   end
 end

data/lib/bitfinex/configurable.rb

@@ -23,6 +23,7 @@ module Bitfinex
     attr_accessor :api_endpoint, :debug, :debug_connection, :secret
     attr_accessor :api_key, :websocket_api_endpoint, :rest_timeout
     attr_accessor :reconnect, :reconnect_after, :rest_open_timeout
+    attr_accessor :api_version
 
     def initialize
       self.api_endpoint = "https://api.bitfinex.com/v1/"
@@ -33,6 +34,14 @@ module Bitfinex
       self.rest_timeout = 30
       self.rest_open_timeout = 30
       self.debug_connection = false
+      self.api_version = 1
+    end
+
+    # Helper that configure to version 2
+    def use_api_v2
+      self.api_version = 2
+      self.api_endpoint = "https://api.bitfinex.com/v2/"
+      self.websocket_api_endpoint = "wss://api.bitfinex.com/ws/2/"
     end
   end
 

data/lib/bitfinex/connection.rb

@@ -4,12 +4,14 @@ module Bitfinex
   module RestConnection
     private
     # Make an HTTP GET request
-    def get(url, options={})
+    def get(url, params={})
       rest_connection.get do |req|
         req.url build_url(url)
         req.headers['Content-Type'] = 'application/json'
         req.headers['Accept'] = 'application/json'
-        req.params = options[:params] if options.has_key?(:params) && !options[:params].empty?
+        params.each do |k,v|
+          req.params[k] = v
+        end
         req.options.timeout = config.rest_timeout
         req.options.open_timeout = config.rest_open_timeout
       end

data/lib/bitfinex/errors.rb

@@ -12,6 +12,7 @@ module Bitfinex
   class ForbiddenError < ServerError; end
   class UnauthorizedError < ServerError; end
   class InternalServerError < ServerError; end
+  class WebsocketError < ServerError; end
 
   class CustomErrors < Faraday::Response::Middleware
     def on_complete(env)
@@ -19,13 +20,13 @@ module Bitfinex
       when 400
         raise BadRequestError, env.body['message']
       when 401
-        raise UnauthorizedError
+        raise UnauthorizedError, env.body['message']
       when 403
-        raise ForbiddenError
+        raise ForbiddenError, env.body['message']
       when 404
-        raise NotFoundError
+        raise NotFoundError, env.body['message']
       when 500
-        raise InternalServerError
+        raise InternalServerError, env.body['message']
       else
         super
       end

data/lib/bitfinex/{account_info.rb → v1/account_info.rb}

@@ -1,6 +1,5 @@
 module Bitfinex
-
-  module AccountInfoClient
+  module V1::AccountInfoClient
 
     # Get account information
     #
@@ -24,6 +23,16 @@ module Bitfinex
       raise BlockMissingError unless block_given?
       ws_auth(&block)
     end
+
+    # See the fees applied to your withdrawals
+    #
+    # @return [Hash]
+    # @example:
+    #   client.fees
+    def fees
+      resp = authenticated_post("fees")
+      resp.body
+    end
   end
 
 end

data/lib/bitfinex/{deposit.rb → v1/deposit.rb}

@@ -1,5 +1,6 @@
 module Bitfinex
-  module DepositClient
+  module V1::DepositClient
+
     # Return your deposit address to make a new deposit.
     #
     # @param method [string] Method of deposit (methods accepted: “bitcoin”, “litecoin”, “darkcoin”, “mastercoin” (tethers)).

data/lib/bitfinex/{funding_book.rb → v1/funding_book.rb}

@@ -1,5 +1,5 @@
 module Bitfinex
-  module FundingBookClient
+  module V1::FundingBookClient
 
     # Get the full margin funding book
 

data/lib/bitfinex/{historical_data.rb → v1/historical_data.rb}

@@ -1,5 +1,5 @@
 module Bitfinex
-  module HistoricalDataClient
+  module V1::HistoricalDataClient
 
     # View all of your balance ledger entries.
     #

data/lib/bitfinex/{lends.rb → v1/lends.rb}

@@ -1,5 +1,5 @@
 module Bitfinex
-  module LendsClient
+  module V1::LendsClient
 
     # Get a list of the most recent funding data for the given currency: total amount provided and Flash Return Rate (in % by 365 days) over time.
     #

data/lib/bitfinex/{margin_funding.rb → v1/margin_funding.rb}

@@ -1,23 +1,26 @@
 module Bitfinex
-  module MarginFundingClient
+  module V1::MarginFundingClient
 
     # Submit a new offer
     #
     # @param currency [string] The name of the currency, es: 'USD'
     # @param amount [decimal] Offer size: how much to lend or borrow
-    # @param rate [decimal] Rate to lend or borrow at. In percentage per 365 days. Set to 0 for FRR).
+    # @param rate [decimal] Rate to lend or borrow at. In percentage per 365 days.
+    #                       Set to 0 for FRR, ±delta for FRR±delta.
     # @param period [integer] Number of days of the funding contract (in days)
     # @param direction [string] Either “lend” or “loan”
+    # @param frrdelta [bool] If true, the rate represents ±delta to FRR.
     # @return [Hash]
     # @example:
     #   client.new_offer("btc", 10.0, 20, 365, "lend")
-    def new_offer(currency, amount, rate, period, direction)
+    def new_offer(currency, amount, rate, period, direction, frrdelta=false)
       params = {
         currency: currency,
         amount: amount.to_s,
         rate: rate.to_s,
         period: period.to_i,
-        direction: direction
+        direction: direction,
+        frrdelta: !!frrdelta
       }
       authenticated_post("offer/new", params: params).body
     end

data/lib/bitfinex/{orderbook.rb → v1/orderbook.rb}

@@ -1,10 +1,10 @@
 # coding: utf-8
 module Bitfinex
-  module OrderbookClient
+  module V1::OrderbookClient
 
     # Get the full order book
     #
-    # @param symbol [string] 
+    # @param symbol [string]
     # @param params :limit_bids [int] (optional) Limit the number of bids returned. May be 0 in which case the array of bids is empty. Default 50.
     # @param params :limit_asks [int] (optional) Limit the number of asks returned. May be 0 in which case the array of asks is empty. Default 50.
     # @param params :group [0/1] (optional) If 1, orders are grouped by price in the orderbook. If 0, orders are not grouped and sorted individually. Default 1
@@ -18,8 +18,8 @@ module Bitfinex
 
 
     # Get the order book changes using websocket
-    # 
-    # @param pair [string] 
+    #
+    # @param pair [string]
     # @param prec [string] Level of price aggregation (P0, P1, P2, P3). The default is P0.
     # @param freq [string] Frequency of updates (F0, F1, F2, F3). F0=realtime / F1=2sec / F2=5sec / F3=10sec
     # @param len [int] Number of price points (“25”, “100”) [default=“25”]

data/lib/bitfinex/{orders.rb → v1/orders.rb}

@@ -1,6 +1,5 @@
 module Bitfinex
-
-  module OrdersClient
+  module V1::OrdersClient
 
     # Submit a new order
     # @param symbol [string] The name of the symbol (see `#symbols`)
@@ -27,7 +26,7 @@ module Bitfinex
         type: type,
         side: side,
         exchange: 'bitfinex',
-        price: price.to_s
+        price: "%.10f" % price.to_f.round(10) # Decimalize float price (necessary for small numbers)
       })
       authenticated_post("order/new", params: params).body
     end
@@ -45,7 +44,7 @@ module Bitfinex
     # @example:
     #   client.multiple_orders([{symbol: "usdbtc", amount: 10, price: 0, exchange: "bitfinex", side: "buy", type: "market"}])
     def multiple_orders(orders)
-      authenticated_post("order/new/multi", params: orders).body
+      authenticated_post("order/new/multi", params: {orders: orders}).body
     end
 
     # Cancel an order

data/lib/bitfinex/{positions.rb → v1/positions.rb}

@@ -1,5 +1,5 @@
 module Bitfinex
-  module PositionsClient
+  module V1::PositionsClient
 
     # View your active positions.
     #

data/lib/bitfinex/{stats.rb → v1/stats.rb}

@@ -1,5 +1,5 @@
 module Bitfinex
-  module StatsClient
+  module V1::StatsClient
 
     # Various statistics about the requested pair.
     #

data/lib/bitfinex/{symbols.rb → v1/symbols.rb}

@@ -1,6 +1,6 @@
 module Bitfinex
-  module SymbolsClient
-    
+  module V1::SymbolsClient
+
     # Get a list of valid symbol IDs.
     #
     # @return [Array]
@@ -17,6 +17,6 @@ module Bitfinex
     # client.symbols_details
     def symbols_details
       get("symbols_details").body
-    end 
+    end
   end
 end

data/lib/bitfinex/{ticker.rb → v1/ticker.rb}

@@ -1,5 +1,5 @@
 module Bitfinex
-  module TickerClient
+  module V1::TickerClient
 
     # Gives innermost bid and asks and information on the most recent trade, as well as high, low and volume of the last 24 hours.
     #
@@ -14,7 +14,7 @@ module Bitfinex
     # Call the specified block passing tickers, it uses websocket
     #
     # @param pair [string]
-    # @param block [Block] The code to be executed when a new ticker is sent by the server 
+    # @param block [Block] The code to be executed when a new ticker is sent by the server
     # @example:
     #   client.listen_ticker do |tick|
     #     puts tick.inspect

data/lib/bitfinex/{trades.rb → v1/trades.rb}

@@ -1,5 +1,5 @@
 module Bitfinex
-  module TradesClient
+  module V1::TradesClient
 
     # Get a list of the most recent trades for the given symbol.
     #
@@ -7,11 +7,11 @@ module Bitfinex
     # @param params :timestamp [time] Only show trades at or after this timestamp.
     # @param params :limit_trades [int] Limit the number of trades returned. Must be >= 1.
     # @return [Array]
-    # @example: 
+    # @example:
     #   client.trades
     def trades(symbol="btcusd", params={})
       check_params(params, %i{timestamp limit_trades})
-      get("trades/#{symbol}", params: params).body
+      get("trades/#{symbol}", params).body
     end
 
     # Listen to the trades using websocket.

data/lib/bitfinex/{wallet.rb → v1/wallet.rb}

@@ -1,5 +1,5 @@
 module Bitfinex
-  module WalletClient
+  module V1::WalletClient
 
     # See your balances.
     #

data/lib/bitfinex/v2/margin.rb

@@ -0,0 +1,34 @@
+module Bitfinex
+  module V2::MarginClient
+
+    # Get active offers
+    #
+    # @example:
+    #    client.offers
+    def offers
+      authenticated_post("auth/r/offers").body
+    end
+
+    # Get account margin info
+    # - if symbol is not specified return everything
+    #
+    # @param symbol [string] (optional)
+    #
+    # @example:
+    #   client.margin_info("tBTCUSD")
+    def margin_info(symbol = "base")
+      authenticated_post("auth/r/margin/#{symbol}").body
+    end
+
+
+    # Get account funding info
+    #
+    # @param symbol [string] default fUSD
+    #
+    # @example:
+    #   client.funding_info
+    def funding_info(symbol = "fUSD")
+      authenticated_post("auth/r/funding/#{symbol}").body
+    end
+  end
+end

data/lib/bitfinex/v2/personal.rb

@@ -0,0 +1,94 @@
+module Bitfinex
+  module V2::PersonalClient
+
+    # Get account wallets
+    #
+    # @example:
+    #   client.wallets
+    def wallets
+      authenticated_post("auth/r/wallets").body
+    end
+
+    # Get account historical daily performance
+    #
+    # @example:
+    #   client.performance
+    def performance
+      authenticated_post("auth/r/stats/perf:1D/hist")
+    end
+
+    # Get the list of alerts
+    #
+    # @example:
+    #   client.alerts
+    def alerts(type = 'price')
+      authenticated_post("auth/r/alerts", params: {type: type}).body
+    end
+
+    # Set a new alert
+    #
+    # @param price
+    # @param symbol
+    # @param type
+    #
+    # @example:
+    #   client.alert(3000, "tBTCUSD")
+    def alert(price, symbol = "tBTCUSD", type = "price")
+      params = {
+        type: type,
+        price: price,
+        symbol: symbol
+      }
+      authenticated_post("auth/w/alert/set", params: params).body
+    end
+
+    # Delete an existing alert
+    #
+    # @param price
+    # @param symbol
+    #
+    # @example:
+    #   client.delete_alert(3000, "tBTCUSD")
+    def delete_alert(price, symbol = "tBTCUSD")
+      authenticated_post("auth/w/alert/price:#{symbol}:#{price}/del").body
+    end
+
+
+    # Calculate available balance for order/offer
+    #
+    # @param rate [int] Rate of the order/offer
+    # @param dir [int] direction of the order/offer
+    #         (orders: > 0 buy, < 0 sell | offers:
+    #             > 0 sell, < 0 buy)
+    # @param type [string] Type of the order/offer
+    #         EXCHANGE or MARGIN
+    # @param symbol [string]
+
+    # @example:
+    #   client.available_balance(800, 1, 'EXCHANGE', 'tBTCUSD')
+    def available_balance(rate, dir, type, symbol)
+      params = {
+        symbol: symbol,
+        dir: dir,
+        type: type,
+        rate: rate
+      }
+      authenticated_post("auth/calc/order/avail", params: params).body
+    end
+
+    # Listen to authenticated channel
+    #
+    # Documentation:
+    #    https://docs.bitfinex.com/v2/reference#account-info
+    #
+    # example:
+    #   client.listen_account do |account|
+    #     puts account
+    #   end
+    def listen_account(&block)
+      raise BlockMissingError unless block_given?
+      ws_auth(&block)
+    end
+
+  end
+end

data/lib/bitfinex/v2/stats.rb

@@ -0,0 +1,27 @@
+# coding: utf-8
+
+module Bitfinex
+  module V2::StatsClient
+
+    # Various statistics about the requested pair.
+    #
+    # @param symbol [string] The symbol you want information about.
+    # @param key [string] Allowed values: "funding.size",
+    #     "credits.size", "credits.size.sym", "pos.size"
+    # @param side [string] Available values: "long", "short"
+    # @param section [string] Available values: "last", "hist"
+    # @param size [string] Available values: '1m'
+    # @param params :sort [int32] if = 1 it sorts results
+    #     returned with old > new
+    #
+    # @return [Array]
+    #
+    # @example:
+    #   client.stats('fUSD', 'pos.size')
+    def stats(symbol = 'fUSD', key = 'funding.size', side = "long", section = "last", size = '1m', params = {})
+      check_params(params, %i{sort})
+      get("stats1/#{key}:#{size}:#{symbol}:#{side}/#{section}").body
+    end
+
+  end
+end

data/lib/bitfinex/v2/ticker.rb

@@ -0,0 +1,58 @@
+# coding: utf-8
+
+module Bitfinex
+  module V2::TickerClient
+
+    # Gives innermost bid and asks and information on
+    # the most recent trade, as well as high, low and
+    # volume of the last 24 hours.
+    #
+    # @param symbols a list of symbols
+    # @return [Hash]
+    # @example:
+    #   client.ticker("tBTCUSD","tLTCUSD","fUSD")
+    def ticker(*symbols)
+      if symbols.size == 1
+        get("ticker/#{symbols.first}").body
+      else
+        get("tickers", symbols: "#{symbols.flatten.join(",")}").body
+      end
+    end
+
+    # Call the specified block passing tickers, it uses websocket
+    #
+    # @param pair [string]
+    # @param block [Block] The code to be executed when a new ticker is sent by the server
+    #
+    # Documentation:
+    #    https://docs.bitfinex.com/v2/reference#ws-public-ticker
+    #
+    # @example:
+    #   client.listen_ticker do |tick|
+    #     puts tick.inspect
+    #   end
+    def listen_ticker(pair="tBTCUSD", &block)
+      raise BlockMissingError unless block_given?
+      register_channel pair: pair, channel: "ticker",  &block
+    end
+
+    # Provides a way to access charting candle info
+    #
+    # @param symbol [string]
+    # @param time_frame [string] default '1m' - see doc for list of options
+    #
+    # Documentation:
+    #    https://docs.bitfinex.com/v2/reference#ws-public-candle
+    #
+    # @example:
+    # client.listen_candles("tBTCUSD","1m") do |candle|
+    #   puts "high #{candle[1][8]} | low #{candle[1][9]}"
+    # end
+    def listen_candles(symbol="tBTCUSD", time_frame="1m", &block)
+      raise BlockMissingError unless block_given?
+      key = "trade:#{time_frame}:#{symbol}"
+      register_channel key: key, channel: 'candles', &block
+    end
+
+  end
+end

data/lib/bitfinex/v2/trading.rb

@@ -0,0 +1,146 @@
+module Bitfinex
+  module V2::TradingClient
+
+    # Provides a way to access charting candle info
+    #
+    # @param symbol [string] The symbol you want information about.
+    # @param timeframe [string] Available values: '1m', '5m', '15m',
+    #        '30m', '1h', '3h', '6h', '12h', '1D', '7D', '14D', '1M'
+    # @param section [string] Available values: "last", "hist"
+    # @param params :limit [int32] Number of candles requested
+    # @param params :start [int32] Filter start (ms)
+    # @param params :end   [int32] Filter end (ms)
+    # @param params :sort  [int32] if = 1 it sorts
+    #        results returned with old > new
+    #
+    # @return [Array]
+    #
+    # @example:
+    #   client.candles('tBTCUSD')
+    def candles(symbol = 'tBTCUSD', timeframe = '1m', section = "last", params = {})
+      check_params(params, %i{limit start end sort})
+      get("candles/trade:#{timeframe}:#{symbol}/#{section}", params).body
+    end
+
+    # The Order Books channel allow you to keep track
+    # of the state of the Bitfinex order book.
+    # It is provided on a price aggregated basis,
+    # with customizable precision.
+    #
+    #
+    # @param symbol [string] The symbol you want
+    #     information about. You can find the list of
+    #     valid symbols by calling the /symbols
+    #     endpoint.
+    # @param precision [string] Level of price
+    #     aggregation (P0, P1, P2, P3, R0)
+    # @param params :len [int32] Number of price
+    #     points ("25", "100")
+    #
+    # @return [Hash] :bids [Array], :asks [Array]
+    #
+    # @example:
+    #   client.orderbook("btcusd")
+    def books(symbol="btcusd", precision="P0", params = {})
+      check_params(params, %i{len})
+      get("book/#{symbol}/#{precision}", params: params).body
+    end
+
+    # Trades endpoint includes all the pertinent details
+    # of the trade, such as price, size and time.
+    #
+    # @param symbol [string] the name of the symbol
+    # @param params :limit [int32] Number of records
+    # @param params :start [int32] Millisecond start time
+    # @param params :end   [int32] Millisecond end time
+    # @param params :sort  [int32] if = 1 it sorts
+    #     results returned with old > new
+    #
+    # @return [Array]
+    #
+    # @example:
+    #   client.trades("tETHUSD")
+    def trades(symbol="tBTCUSD", params={})
+      check_params(params, %i{limit start end sort})
+      get("trades/#{symbol}", params).body
+    end
+
+    # Get active orders
+    #
+    # example:
+    # client.orders
+    def orders
+      authenticated_post("auth/r/orders").body
+    end
+
+    # Get Trades generated by an Order
+    #
+    # @param order_id [int32] Id of the order
+    # @param symbol [string] symbol used for the order
+    #
+    # @return [Array]
+    #
+    # @example:
+    #   client.order_trades 10010, "tBTCUSD"
+    #
+    def order_trades(order_id, symbol="tBTCUSD")
+      authenticated_post("auth/r/order/#{symbol}:#{order_id}/trades").body
+    end
+
+
+    # Get active positions
+    #
+    # return [Array]
+    #
+    # @example:
+    #    client.active_positions
+    def active_positions
+      authenticated_post("auth/positions").body
+    end
+
+
+    # This channel sends a trade message whenever a trade occurs at Bitfinex.
+    # It includes all the pertinent details of the trade, such as price, size and time.
+    #
+    # @param symbol [string]
+    # @param block [Block] The code to be executed when a new ticker is sent by the server
+    #
+    # Documentation:
+    #   https://docs.bitfinex.com/v2/reference#ws-public-trades
+    #
+    # @example:
+    #   client.listen_trades("tBTCUSD") do |trade|
+    #     puts "traded #{trade[2][2]} BTC for #{trade[2][3]} USD"
+    #   end
+    def listen_trades(symbol="tBTCUSD", &block)
+      raise BlockMissingError unless block_given?
+      register_channel symbol: symbol, channel: "trades", &block
+    end
+
+    # The Order Books channel allow you to keep track of the state of the Bitfinex order book.
+    # It is provided on a price aggregated basis, with customizable precision.
+    # After receiving the response, you will receive a snapshot of the book,
+    # followed by updates upon any changes to the book.
+    #
+    # @param symbol [string]
+    # @param precision [string] Level of price aggregation (P0, P1, P2, P3, R0).
+    #       (default P0) R0 is raw books - These are the most granular books.
+    # @param frequency [string] Frequency of updates (F0, F1, F2, F3).
+    #       F0=realtime / F1=2sec / F2=5sec / F3=10sec (default F0)
+    # @param length [int] Number of price points ("25", "100") [default="25"]
+    #
+    # Documentation:
+    #   https://docs.bitfinex.com/v2/reference#ws-public-order-books
+    #   https://docs.bitfinex.com/v2/reference#ws-public-raw-order-books
+    #
+    # @example:
+    #   client.listen_book("tBTCUSD") do |trade|
+    #     puts "traded #{trade[2][2]} BTC for #{trade[2][3]} USD"
+    #   end
+    def listen_book(symbol="tBTCUSD", frequency="F0", length=25, precision="P0", &block)
+      raise BlockMissingError unless block_given?
+      register_channel symbol: symbol, channel: "book", prec: precision, freq: frequency, len: length, &block
+    end
+
+  end
+end

data/lib/bitfinex/v2/utils.rb

@@ -0,0 +1,27 @@
+# coding: utf-8
+
+module Bitfinex
+  module V2::UtilsClient
+
+    # Calculate the average execution rate for Trading or Margin funding.
+    #
+    # @param symbol [string] The symbol you want information about.
+    # @param amount [string] Amount. Positive for buy, negative for sell (ex. "1.123")
+    # @param period [string] (optional) Maximum period for Margin Funding
+    # @param rate_limit [string] Limit rate/price (ex. "1000.5")
+    #
+    # @return [Array]
+    #
+    # @example:
+    #   client.calc_avg_price('tBTCUSD', 1000, 1000)
+    def calc_avg_price(symbol = 'tBTCUSD', amount = 0, period = 0, rate_limit = nil)
+      params = {
+        symbol: symbol,
+        amount: amount.to_s,
+        period: period.to_s
+      }
+      params[:rateLimit] = rate_limit.to_s unless rate_limit.nil?
+      get("calc/trade/avg",params)
+    end
+  end
+end

data/lib/bitfinex/version.rb

@@ -1,3 +1,3 @@
 module Bitfinex
-  VERSION = "0.0.11"
+  VERSION = "0.1.0"
 end

data/lib/bitfinex/websocket_connection.rb

@@ -16,23 +16,38 @@ module Bitfinex
     end
 
     def ws_close_all
-      ws_client.close!
+      ws_client.stop!
       @ws_open = false
       ws_reset_channels
     end
 
     def ws_auth(&block)
       unless @ws_auth
-        payload = 'AUTH' + (Time.now.to_f * 10_000).to_i.to_s
-        signature = sign(payload)
-        add_callback(:auth, &block)
-        save_channel_id(:auth, 0)
-        ws_safe_send({
-          apiKey: config.api_key,
-          authSig: sign(payload),
-          authPayload: payload,
-          event: 'auth'
-        })
+        nonce = (Time.now.to_f * 10_000).to_i.to_s
+        sub_id = add_callback(&block)
+        save_channel_id(sub_id,0)
+        if config.api_version == 1
+          payload = 'AUTH' + nonce
+          signature = sign(payload)
+          ws_safe_send({
+            apiKey: config.api_key,
+            authSig: sign(payload),
+            authPayload: payload,
+            subId: sub_id.to_s,
+            event: 'auth'
+          })
+        else
+          payload = 'AUTH' + nonce + nonce
+          signature = sign(payload)
+          ws_safe_send({
+            apiKey: config.api_key,
+            authSig: sign(payload),
+            authPayload: payload,
+            authNonce: nonce,
+            subId: sub_id.to_s,
+            event: 'auth'
+          })
+        end
         @ws_auth = true
       end
     end
@@ -71,15 +86,22 @@ module Bitfinex
     end
 
     def callbacks
-      @callbacks ||= {}
+      @callbacks ||= []
     end
 
-    def add_callback(channel, &block)
-      callbacks[channel] = { block: block, chan_id: nil }
+    def add_callback(&block)
+      id = 0
+      @mutex.synchronize do
+        callbacks[@c_counter] = { block: block, chan_id: nil }
+        id = @c_counter
+        @c_counter += 1
+      end
+      id
     end
 
     def register_authenticated_channel(msg, &block)
-      add_callback(fingerprint(msg),&block)
+      sub_id = add_callback(&block)
+      msg.merge!(subId: sub_id.to_s)
       ws_safe_send(msg.merge(event:'subscribe'))
     end
 
@@ -92,7 +114,8 @@ module Bitfinex
     end
 
     def register_channel(msg, &block)
-      add_callback(fingerprint(msg),&block)
+      sub_id = add_callback(&block)
+      msg.merge!(subId: sub_id.to_s)
       if ws_open
         ws_client.send msg.merge(event: 'subscribe')
       else
@@ -100,25 +123,20 @@ module Bitfinex
       end
     end
 
-    def fingerprint(msg)
-      msg.reject{|k,v| [:event,'chanId','event'].include?(k) }.
-          inject({}){|h, (k,v)| h[k.to_sym]=v.to_s; h}
-    end
-
     def listen
       ws_client.on(:message) do |rmsg|
          msg = JSON.parse(rmsg)
          if msg.kind_of?(Hash) && msg["event"] == "subscribed"
-           save_channel_id(fingerprint(msg), msg["chanId"])
+           save_channel_id(msg["subId"],msg["chanId"])
          elsif msg.kind_of?(Array)
            exec_callback_for(msg)
          end
       end
     end
 
-    def save_channel_id(chan,id)
-      callbacks[chan][:chan_id] = id
-      chan_ids[id.to_i] = chan
+    def save_channel_id(sub_id,chan_id)
+      callbacks[sub_id.to_i][:chan_id] = chan_id
+      chan_ids[chan_id] = sub_id.to_i
     end
 
     def exec_callback_for(msg)
@@ -198,12 +216,15 @@ module Bitfinex
       end
 
       def ws_closed(event)
-        return unless @reconnect
-        EM.add_timer(@reconnect_after){ connect! } unless @stop
+        if @stop
+          EM.stop
+        elsif @reconnect
+          EM.add_timer(@reconnect_after){ connect! }
+        end
       end
 
       def ws_error(event)
-        fail event
+        raise WebsocketError, event.message
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitfinex-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
 platform: ruby
 authors:
 - Bitfinex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -132,27 +132,35 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/bitfinex-api-rb.rb
+- lib/bitfinex-rb.rb
 - lib/bitfinex.rb
-- lib/bitfinex/account_info.rb
+- lib/bitfinex/api_versions.rb
 - lib/bitfinex/authenticated_rest.rb
 - lib/bitfinex/client.rb
 - lib/bitfinex/configurable.rb
 - lib/bitfinex/connection.rb
-- lib/bitfinex/deposit.rb
 - lib/bitfinex/errors.rb
-- lib/bitfinex/funding_book.rb
-- lib/bitfinex/historical_data.rb
-- lib/bitfinex/lends.rb
-- lib/bitfinex/margin_funding.rb
-- lib/bitfinex/orderbook.rb
-- lib/bitfinex/orders.rb
-- lib/bitfinex/positions.rb
-- lib/bitfinex/stats.rb
-- lib/bitfinex/symbols.rb
-- lib/bitfinex/ticker.rb
-- lib/bitfinex/trades.rb
+- lib/bitfinex/v1/account_info.rb
+- lib/bitfinex/v1/deposit.rb
+- lib/bitfinex/v1/funding_book.rb
+- lib/bitfinex/v1/historical_data.rb
+- lib/bitfinex/v1/lends.rb
+- lib/bitfinex/v1/margin_funding.rb
+- lib/bitfinex/v1/orderbook.rb
+- lib/bitfinex/v1/orders.rb
+- lib/bitfinex/v1/positions.rb
+- lib/bitfinex/v1/stats.rb
+- lib/bitfinex/v1/symbols.rb
+- lib/bitfinex/v1/ticker.rb
+- lib/bitfinex/v1/trades.rb
+- lib/bitfinex/v1/wallet.rb
+- lib/bitfinex/v2/margin.rb
+- lib/bitfinex/v2/personal.rb
+- lib/bitfinex/v2/stats.rb
+- lib/bitfinex/v2/ticker.rb
+- lib/bitfinex/v2/trading.rb
+- lib/bitfinex/v2/utils.rb
 - lib/bitfinex/version.rb
-- lib/bitfinex/wallet.rb
 - lib/bitfinex/websocket_connection.rb
 homepage: https://www.bitfinex.com/
 licenses:
@@ -174,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Bitfinex API Wrapper