okex 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 012c9b50e5c4dd3fb5522d0eef07764feb177c23a2aee07e1a847399fb7b7d68
-  data.tar.gz: 43f87e76c36c65bf9b81122392b36af8bee0f5125617b28ff2a6e2ae6a36196a
+  metadata.gz: 9d0150ce45ec59cd9ded8310ef2d1346c4dc4bac69d2c90fc676ef12edc4b50c
+  data.tar.gz: 96b70fdc8c95ee1cd3e0ff980a93c7bbb0b97e1a8917f98a4f471072f8ccbb39
 SHA512:
-  metadata.gz: 84533cb2cc12b733a01c29a3f76274e1b179573fa0ad21e2588c87b04e76e9afdca18979c22056b4fa4c75fbec578e7fbb319e198721bedb9150e39e4f819f2a
-  data.tar.gz: 839673d67fed38b99dce0b5d5f31df562e56d9617c5e7c87cad1772136b616c60d457d6d9397427372bb0b6fd4168c9b035a8d74fb50b972c9bfc68e48defbce
+  metadata.gz: 6ca66d2608fcea9ed02dc4881b113650e22b262478bce2a885383dcb96dda5818f59f61340c8f87613eefa49b3e8d86f95677bb34a75245395178e41d3156746
+  data.tar.gz: 8f1a140fffe151688a64304a41ff5162f085fdc5bb4bb61daabef30c3a276946863e574242e26c277f07f79d53e7f4cdf9f86287dd7c661c68eaf90315aa220b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    okex (0.2.5)
+    okex (0.2.7)
       faraday (~> 1.5)
 
 GEM

data/lib/okex.rb

@@ -4,9 +4,8 @@ require "okex/api_v5"
 require "okex/client"
 require "okex/coin"
 require "okex/order"
-require "okex/account_order"
-require "okex/trade_order"
 require "okex/host"
+require "okex/max_size"
 
 
 module OKEX

data/lib/okex/api_v5.rb

@@ -8,21 +8,16 @@ class OKEX::ApiV5
     client.get(host, "/api/v5/public/instruments?instType=SWAP")
   end
 
-  def account_orders
-    resp = client.get(host, "/api/v5/account/positions")
-    
-    if resp['success']
-      return resp['data'].map {|params| OKEX::AccountOrder.new(params)}
+  def orders(inst_id=nil)
+    url = "/api/v5/account/positions"
+    if inst_id.present?
+      url += "?instId=#{inst_id}"
     end
 
-    []
-  end
-
-  def trade_orders(instrument_id)
-    resp = client.get(host, "/api/v5/trade/order?instId=#{instrument_id}")
+    resp = client.get(host, url)
     
-    if resp['code'].to_i == 0 && resp['data'].size > 0
-      return resp['data'].map {|params| OKEX::TradeOrder.new(params)}
+    if resp['success']
+      return resp['data'].map {|params| OKEX::Order.new(params)}
     end
 
     []
@@ -49,6 +44,20 @@ class OKEX::ApiV5
     close_position(instrument_id, "short")
   end
 
+  def max_size(instrument_id)
+    result = 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
+    end
+    
+    ret
+  end
+
   private
 
   attr_reader :client, :host

data/lib/okex/max_size.rb

@@ -0,0 +1,3 @@
+class OKEX::MaxSize < Struct.new(:buy, :sell)
+  def 
+end

data/lib/okex/order.rb

@@ -7,7 +7,7 @@ module OKEX
       @params = params
     end
 
-    def instrument_id
+    def inst_id
       dig("instId")
     end
     
@@ -71,6 +71,16 @@ module OKEX
       dig("pos").to_i
     end
 
+    # 是否正在持仓
+    def open?
+      pos > 0
+    end
+
+    # 已经平仓
+    def closed?
+      pos == 0
+    end
+
     private
 
     def dig(key)

data/lib/okex/version.rb

@@ -1,3 +1,3 @@
 module OKEX
-  VERSION = "0.2.6"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: okex
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - David Zhang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-24 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,15 +99,14 @@ files:
 - bin/console
 - bin/setup
 - lib/okex.rb
-- lib/okex/account_order.rb
 - lib/okex/api_v3.rb
 - lib/okex/api_v5.rb
 - lib/okex/client.rb
 - lib/okex/coin.rb
 - lib/okex/coin/bitcoin.rb
 - lib/okex/host.rb
+- lib/okex/max_size.rb
 - lib/okex/order.rb
-- lib/okex/trade_order.rb
 - lib/okex/version.rb
 - okex.gemspec
 homepage: https://github.com/daqing/okex

data/lib/okex/account_order.rb

@@ -1,4 +0,0 @@
-module OKEX
-  class AccountOrder < Order
-  end
-end

data/lib/okex/trade_order.rb

@@ -1,24 +0,0 @@
-module OKEX
-  class TradeOrder < Order
-
-    # 预估强平价
-    def est_liq_price
-      dig("liqPx").to_f
-    end
-
-    # 最新成交价
-    def last_price
-      dig("fillPx").to_f
-    end
-
-    # 未实现收益
-    def upl
-      dig("pnl").to_f
-    end
-
-    # 持仓张数
-    def pos
-      dig("sz").to_i
-    end
-  end
-end