okex 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c24e96c13dd676d1ece02650d07e9c32624f124ea092d17bdcf2d87d621c1236
-  data.tar.gz: b67158ebbd5aece70467880e1fb1d8f955f362a671f78bebc7d285c17764ee1b
+  metadata.gz: a104fac8edf7712e91a90bdab72ccccc93cb1e20633400c70aee249b69b22202
+  data.tar.gz: 8003c43686c142e4619a4ff52852aa4cbb5c050bcfd161df2af5d0fbe35409fb
 SHA512:
-  metadata.gz: f963003215c3bc2b79a8168757f82d4a52bc07e8f8e698f0e231dd296af3e0d6f5e5f9f262f923ace4ad5816d7e01bb9cf75b9c7cb101325cb0d4d678f5873ac
-  data.tar.gz: 3dcfcf6d73f158e69f4240b267199143201c5a872f6dc312322ee8ffc91d9cee559a10e30c56a3ccc3baea214aa78924071b5b0ceb61f5ccb82425523dbd1335
+  metadata.gz: 34a805305702198ec747fc78bd8c34fa8a7a1a67594e63334c63d2eb17591875d81c88273084aae92b4182a8330ae009e115c64ee7fd0f5e49dcc59524b0de80
+  data.tar.gz: ad5fb25b020d99ee030272cffa8b706f3ac077442caa26df10c1c6a8a2214b34c6c6842f60f668e9634e6423858f8a930c6b4f221ae16f002b5b6f3a32dda068

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    okex (0.2.7)
+    okex (0.3.1)
       faraday (~> 1.5)
 
 GEM
@@ -9,7 +9,7 @@ GEM
   specs:
     byebug (11.1.3)
     diff-lcs (1.4.4)
-    faraday (1.5.0)
+    faraday (1.5.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -24,7 +24,7 @@ GEM
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
     faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
+    faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     multipart-post (2.1.1)
     rake (10.5.0)
@@ -41,7 +41,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    ruby2_keywords (0.0.4)
+    ruby2_keywords (0.0.5)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,6 +1,6 @@
 # okex
 
-This is the V3 API ruby lib for okex.com
+This is the V5 API ruby lib for okex.com
 
 ## Installation
 
@@ -20,6 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
+Set `OKEX_DEBUG` environment flag to 1 to print debug messages.
 
 ## Development
 

data/lib/okex.rb

@@ -2,10 +2,14 @@ require "okex/version"
 require "okex/api_v3"
 require "okex/api_v5"
 require "okex/client"
-require "okex/coin"
+require "okex/coin/bitcoin"
+require "okex/coin/usdt"
 require "okex/order"
 require "okex/host"
 require "okex/max_size"
+require "okex/api_error"
+require "okex/balance"
+
 
 
 module OKEX

data/lib/okex/api_error.rb

@@ -0,0 +1,13 @@
+module OKEX
+  class ApiError < StandardError
+    def initialize(code, data, msg)
+      @code = code
+      @data = data
+      @msg = msg
+    end
+
+    def to_s
+      "code=#{@code}, data=#{@data}, msg=#{@msg}"
+    end
+  end
+end

data/lib/okex/api_v5.rb

@@ -14,13 +14,23 @@ class OKEX::ApiV5
       url += "?instId=#{inst_id}"
     end
 
-    resp = client.get(host, url)
-    
-    if resp['success']
-      return resp['data'].map {|params| OKEX::Order.new(params)}
-    end
+    data = client.get(host, url)
 
-    []
+    data.map {|params| OKEX::Order.new(params)}
+  end
+
+  def balance(ccy, round)
+    data = client.get(host, "/api/v5/account/balance?ccy=#{ccy}")
+
+    details = data[0]['details'][0]
+
+    OKEX::Balance.new(
+      details['ccy'],
+      dig_round(details, 'cashBal', round),
+      dig_round(details, 'avalEq', round),
+      dig_round(details, 'frozenBal', round),
+      dig_round(details, 'upl', round)
+    )
   end
 
   def long_swap(instid, amount)
@@ -49,6 +59,22 @@ class OKEX::ApiV5
     client.post(host, "/api/v5/trade/order", params)
   end
 
+  # # 开多带止损
+  # def long_swap_stop(instid, amount, stop_price)
+  #   params = {
+  #     "instId": instid,
+  #     "tdMode": "cross",
+  #     "side": "buy",
+  #     "posSide": "long",
+  #     "ordType": "conditional",
+  #     "sz": amount.to_s,
+  #     "slTriggerPx": stop_price.to_s,
+  #     "slOrdPx": "-1", # 执行市价止损
+  #   }
+
+  #   client.post(host, "/api/v5/trade/order-algo", params)
+  # end
+
   def close_long(instrument_id)
     close_position(instrument_id, "long")
   end
@@ -58,16 +84,15 @@ class OKEX::ApiV5
   end
 
   def max_size(instrument_id)
-    result = client.get(host, "/api/v5/account/max-size?instId=#{instrument_id}&tdMode=cross")
+    data = client.get(host, "/api/v5/account/max-size?instId=#{instrument_id}&tdMode=cross")
     
     ret = OKEX::MaxSize.new(-1, -1)
-    if result['success']
-      el = result['data'][0]
-      if el.present? && el['maxBuy'].to_i > 0 && el['maxSell'].to_i > 0
-        ret = OKEX::MaxSize.new(el['maxBuy'].to_i, el['maxSell'].to_i)
-      end
+
+    el = data[0]
+    if el.present? && el['maxBuy'].to_i > 0 && el['maxSell'].to_i > 0
+      ret = OKEX::MaxSize.new(el['maxBuy'].to_i, el['maxSell'].to_i)
     end
-    
+
     ret
   end
 
@@ -84,4 +109,8 @@ class OKEX::ApiV5
 
     client.post(host, "/api/v5/trade/close-position", params)
   end
+
+  def dig_round(obj, key, round)
+    obj[key].to_f.round(round)
+  end
 end

data/lib/okex/balance.rb

@@ -0,0 +1,2 @@
+class OKEX::Balance < Struct.new(:currency, :total, :available, :frozen, :upl)
+end

data/lib/okex/client.rb

@@ -12,19 +12,27 @@ module OKEX
     end
 
     def get(host, path)
+      url = host + path
       ts = timestamp
       sig = sign(ts, "GET", path)
+      _h = headers(ts, sig)
 
-      _resp(Faraday.get(host + path, nil, headers(ts, sig)))
+      puts "---> GET: url=#{url}, headers=#{_h}" if ENV['OKEX_DEBUG'].to_i > 0
+
+      _resp(Faraday.get(url, nil, _h))
     end
 
     def post(host, path, payload)
       payload_json = gen_payload(payload)
 
+      url = host + path
       ts = timestamp
       sig = sign(ts, "POST", path + payload_json)
+      _h = headers(ts, sig)
+
+      puts "---> POST: url=#{url}, payload=#{payload_json}, headers=#{_h}" if ENV['OKEX_DEBUG'].to_i > 0
 
-      _resp(Faraday.post(host + path, payload_json, headers(ts, sig)))
+      _resp(Faraday.post(url, payload_json, _h))
     end
 
     private
@@ -64,10 +72,10 @@ module OKEX
       
       code = result['code'].to_i
       if code == 0 && result['msg'].empty?
-        return {'success' => true, 'data' => result['data']}
-      else
-        return {'success' => false, 'code' => code, 'msg' => result['msg']}
+        return result['data']
       end
+
+      raise OKEX::ApiError.new(code, result['data'], result['msg'])
     end
   end
 end

data/lib/okex/coin/usdt.rb

@@ -0,0 +1,11 @@
+module OKEX
+  module Coin
+    class USDT
+      CODE = "USDT".freeze
+
+      def self.code
+        CODE
+      end
+    end
+  end
+end

data/lib/okex/version.rb

@@ -1,3 +1,3 @@
 module OKEX
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: okex
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - David Zhang
@@ -99,11 +99,14 @@ files:
 - bin/console
 - bin/setup
 - lib/okex.rb
+- lib/okex/api_error.rb
 - lib/okex/api_v3.rb
 - lib/okex/api_v5.rb
+- lib/okex/balance.rb
 - lib/okex/client.rb
 - lib/okex/coin.rb
 - lib/okex/coin/bitcoin.rb
+- lib/okex/coin/usdt.rb
 - lib/okex/host.rb
 - lib/okex/max_size.rb
 - lib/okex/order.rb