okex 0.1.20 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75fda5af2580d3fa8aa86fef858ce7ab31872d73a7b2819e9ab8f6e0991760ac
-  data.tar.gz: 924019880495be349930339802e0dc7c8e2a6876f16653ae605ead7c63389c8e
+  metadata.gz: dae1478814bf6ccebb68aaf3bd52c3ac834148cb90b4b8e8f6427ccc811304eb
+  data.tar.gz: 53bc2e5e42b90f1f60390273a82f98fa4caf19c07d238f38edac4bbf7a51a572
 SHA512:
-  metadata.gz: 174b2e94fb591fd9bf89a2c0c08b19f8932c414c6be66488010320bacf751438310feac5bf3fe005e4a12287474a3a8b4c2465840b6aa40c6cd8cb4eae34883e
-  data.tar.gz: cbc2d4163fd749e194325afbf8cc1e9386cef004b50e19a3ab1d90fe31c96a97f0c80928f7d833342826f0c8db4bdc6f8096d7d5f1b84757e88a965a1cece606
+  metadata.gz: 0afed6eb2d1e37d817e8f172d3713a1aec653a3eb70cab406523e5e7fc21aae803f0a64d16e11fa73440d34507c37303d2f33c7669ecc5218657546f322ce295
+  data.tar.gz: 6bb22c3ce7cc7b3a739a975d7a7b3239edb5d2e5edb9bc5ea056229ca238ab806c25fc9c8703bedc8e969d28cea42c8119733ac603d11db359fcbad13e418594

data/Gemfile.lock

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

data/lib/okex.rb

@@ -1,12 +1,11 @@
 require "okex/version"
-require "okex/api"
+require "okex/api_v3"
+require "okex/api_v5"
 require "okex/client"
 require "okex/coin"
 require "openssl"
 require "faraday"
 
-OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
-
 module OKEX
   class Error < StandardError; end
 end

data/lib/okex/api_v3.rb

@@ -0,0 +1,46 @@
+class OKEX::ApiV3
+  def initialize(client)
+    @client = client
+  end
+
+  def balance(coin)
+    client.get("/api/account/v3/wallet/#{coin.code}")
+  end
+
+  def instruments
+    client.get("/api/swap/v3/instruments")
+  end
+
+  # 市价做空永续合约
+  # amount: 仓位开多少张
+  def short_swap(instrument_id, amount)
+    param = {
+      instrument_id: instrument_id.to_s,
+      size: amount.to_s,
+      type: "2",
+      order_type: "4",
+    }
+
+    client.post("/api/swap/v3/order", param)
+  end
+
+  # 市价平多
+  def close_long(instrument_id)
+    close_position(instrument_id, "long")
+  end
+
+  # 市价平空
+  def close_short(instrument_id)
+    close_position(instrument_id, "short")
+  end
+
+  private
+
+  attr_reader :client
+
+  def close_position(instrument_id, direction)
+    param = {"instrument_id": instrument_id, "direction": direction}
+
+    client.post("/api/swap/v3/close_position", param)
+  end
+end

data/lib/okex/api_v5.rb

@@ -0,0 +1,44 @@
+class OKEX::ApiV5
+  def initialize(client)
+    @client = client
+  end
+
+  def instruments
+    client.get("/api/v5/public/instruments")
+  end
+
+  def short_swap(instid, amount)
+    params = {
+      "instId": instid,
+      "tdMode": "cross",
+      "side": "sell",
+      "posSide": "short",
+      "ordType": "market",
+      "sz": "1"
+    }
+
+    client.post("/api/v5/trade/order", params)
+  end
+
+  def close_long(instid)
+    close_position(instid, "long")
+  end
+
+  def close_short(instid)
+    close_position(instid, "short")
+  end
+
+  private
+
+  attr_reader :client
+
+  def close_position(instid, direction)
+    params = {
+      "instId": instid,
+      "mgnMode": "cross",
+      "posSide": direction
+    }
+
+    client.post("/api/v5/trade/close-position", params)
+  end
+end

data/lib/okex/client.rb

@@ -8,46 +8,14 @@ module OKEX
       @passphrase = passphrase
     end
 
-    def balance(coin)
-      _get("/api/account/v3/wallet/#{coin.code}")
-    end
-
-    # name: sub account name
-    def sub_account(name)
-      _get("/api/account/v3/sub-account?sub-account=#{name}")
-    end
-
-    def instruments
-      _get("/api/swap/v3/instruments")
-    end
-
-    # 市价做空永续合约
-    # amount: 仓位开多少张
-    def short_swap(instrument_id, amount)
-      param = {
-        instrument_id: instrument_id.to_s,
-        size: amount.to_s,
-        type: "2",
-        order_type: "4",
-      }
-
-      _post("/api/swap/v3/order", param)
-    end
-
-    private
-
-    attr_reader :api_key, :api_secret, :passphrase
-
-    HOST = "https://www.okex.com"
-
-    def _get(path)
+    def get(path)
       ts = timestamp
       sig = sign(ts, "GET", path)
 
       _resp(::Faraday.get(HOST + path, nil, headers(ts, sig)))
     end
 
-    def _post(path, payload)
+    def post(path, payload)
       payload_json = gen_payload(payload)
 
       ts = timestamp
@@ -62,6 +30,12 @@ module OKEX
       end
     end
 
+    private
+
+    attr_reader :api_key, :api_secret, :passphrase
+
+    HOST = "https://www.okex.com"
+
     def gen_payload(payload)
       m = payload.map { |k, v| JSON.generate({k => v}, {space: ' '})}
       m2 = m.join(", ").gsub("{", "").gsub("}", "")

data/lib/okex/version.rb

@@ -1,3 +1,3 @@
 module OKEX
-  VERSION = "0.1.20"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: okex
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.2.0
 platform: ruby
 authors:
 - David Zhang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-07 00:00:00.000000000 Z
+date: 2021-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,7 +85,8 @@ files:
 - bin/console
 - bin/setup
 - lib/okex.rb
-- lib/okex/api.rb
+- lib/okex/api_v3.rb
+- lib/okex/api_v5.rb
 - lib/okex/client.rb
 - lib/okex/coin.rb
 - lib/okex/coin/bitcoin.rb

data/lib/okex/api.rb

@@ -1,15 +0,0 @@
-module OKEX
-  class API
-    def initialize(client)
-      @client = client
-    end
-
-    def method_missing(m, *args, &block)
-      client.send(m, *args)
-    end
-
-    private
-
-    attr_reader :client
-  end
-end