okex 0.3.4 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 463b9adff7eb98e1fa712f06153edbc29b80870aede2cd2913681da84f0e5b66
-  data.tar.gz: 428d38ce826c5e3e01ddcd43c3a9e8e4e5b2de1d4f41139497ad5beee818b452
+  metadata.gz: f7579882ca09b2d2555970e0387d344193b59b374fadc72f3c5146591cba329b
+  data.tar.gz: 149af01aaa918bab7aa5f32f3198c195f9a467d86fd2914b82941928a9a0fd04
 SHA512:
-  metadata.gz: 615e679ffb2f370020af864cdc753bcf7cb836a83e73a127046f09712b1a81a4d20dcbe94643e19177f1c61578fb8e3bfd44f752673fed56ab4208d4eeda7ee0
-  data.tar.gz: dc96eacc3985d1889eac587fee049b2c174eca9e245d03e66a4bfb3f1cb8c1871c99cb73ef70f5b418703883f4e6927888c7806492841fb76a71f9b4b43a332a
+  metadata.gz: a94f5d2e91c1d5021a2b528514d9159a81b3da12112c5ca05f1431f498f625b93379bf51e2cddb898b6ec2f151bd77a506cd2c8ff8190b18d00c46def1d77738
+  data.tar.gz: 448c8cbbcd164b29d9fdc6e2a4a044cb48dd2d0a7802502f13105631453b8bba4730f08855907eb314c49349bb7a4b893eeeacea0020a77ade0f9e2c78e16766

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    okex (0.3.4)
+    okex (0.3.8)
       faraday (~> 1.5)
 
 GEM
@@ -9,7 +9,7 @@ GEM
   specs:
     byebug (11.1.3)
     diff-lcs (1.4.4)
-    faraday (1.5.1)
+    faraday (1.7.1)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -17,6 +17,7 @@ GEM
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
       faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
@@ -26,6 +27,7 @@ GEM
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
     multipart-post (2.1.1)
     rake (10.5.0)
     rspec (3.10.0)

data/lib/okex/api_v5.rb

@@ -69,7 +69,7 @@ class OKEX::ApiV5
 
   def max_size(instrument_id)
     data = client.get(host, "/api/v5/account/max-size?instId=#{instrument_id}&tdMode=cross")
-    
+
     ret = OKEX::MaxSize.new(-1, -1)
 
     el = data[0]
@@ -85,6 +85,16 @@ class OKEX::ApiV5
 
     data[0]['lever'].to_i
   end
+  
+  def set_leverage(inst_id, leverage)
+    params = {
+      "instId": inst_id,
+      "lever": leverage,
+      "mgnMode": "cross"
+    }
+
+    client.post(host, "/api/v5/account/set-leverage", params)
+  end
 
   # 设置止损价格
   # @param inst_id [String] 合约名称
@@ -112,11 +122,37 @@ class OKEX::ApiV5
   # @param inst_id [String] 合约名称
   def stop_loss_price(inst_id)
     result = client.get(host, "/api/v5/trade/orders-algo-pending?instId=#{inst_id}&instType=SWAP&ordType=conditional")
-    return result[0]["slTriggerPx"].to_i if result.size == 1
+
+    return -1 if result.empty?
+    return result[0]["slTriggerPx"].to_f if result.size == 1
 
     raise "invalid result: #{result.inspect}"
   end
 
+  # 查询当前止损订单的ID
+  # 可用于后续取消止损订单
+  # @param inst_id [String] 合约名称
+  def algo_order_id(inst_id)
+    result = client.get(host, "/api/v5/trade/orders-algo-pending?instId=#{inst_id}&instType=SWAP&ordType=conditional")
+
+    return "" if result.empty?
+    return result[0]["algoId"] if result.size == 1
+
+    raise "invalid result: #{result.inspect}"
+  end
+
+  # 撤销委托单
+  # @param algo_id [String] 策略委托单ID
+  # @param inst_id [String] 合约ID
+  def cancel_algo_order(algo_id, inst_id)
+    params = {
+      "algoId": algo_id,
+      "instId": inst_id
+    }
+
+    client.post(host, "/api/v5/trade/cancel-algos", [params])
+  end
+
   private
 
   attr_reader :client, :host

data/lib/okex/client.rb

@@ -23,8 +23,15 @@ module OKEX
     end
 
     def post(host, path, payload)
-      payload_json = gen_payload(payload)
-
+      if payload.is_a?(Array)
+        _json = payload.map do |hx|
+          gen_payload(hx)
+        end
+        payload_json = "[#{_json.join(",")}]"
+      else
+        payload_json = gen_payload(payload)
+      end
+      
       url = host + path
       ts = timestamp
       sig = sign(ts, "POST", path + payload_json)

data/lib/okex/version.rb

@@ -1,3 +1,3 @@
 module OKEX
-  VERSION = "0.3.4"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: okex
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.8
 platform: ruby
 authors:
 - David Zhang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler