spot order supports gt fee discount and POC

revilwang · revilwang · commit 6f355d6c94c0 · 2020-03-20T20:16:07.000+08:00
diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@ APIv4 provides spot, margin and futures trading operations. There are public API
 
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 4.10.0
-- Package version: 4.10.0
+- API version: 4.11.0
+- Package version: 4.11.0
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 For more information, please visit [https://www.gate.io/page/contacts](https://www.gate.io/page/contacts)
 
diff --git a/docs/BatchOrder.md b/docs/BatchOrder.md
@@ -17,14 +17,17 @@ Name | Type | Description | Notes
 **side** | **str** | Order side | [optional] 
 **amount** | **str** | Trade amount | [optional] 
 **price** | **str** | Order price | [optional] 
-**time_in_force** | **str** | Time in force | [optional] [default to 'gtc']
-**auto_borrow** | **bool** | Used in margin trading(e.g. &#x60;account&#x60; is &#x60;margin&#x60;) to allow automatic loan of lacked part if balance is not enough. | [optional] 
+**time_in_force** | **str** | Time in force  - gtc: GoodTillCancelled - ioc: ImmediateOrCancelled, taker only - poc: PendingOrCancelled, reduce only | [optional] [default to 'gtc']
+**auto_borrow** | **bool** | Used in margin trading(e.g. &#x60;account&#x60; is &#x60;margin&#x60;) to allow automatic loan of insufficient part if balance is not enough. | [optional] 
 **left** | **str** | Amount left to fill | [optional] 
 **fill_price** | **str** | Fill price of the order | [optional] 
 **fee** | **str** | Fee deducted | [optional] 
 **fee_currency** | **str** | Fee currency unit | [optional] 
 **point_fee** | **str** | Point used to deduct fee | [optional] 
 **gt_fee** | **str** | GT used to deduct fee | [optional] 
+**gt_discount** | **bool** | Whether GT fee discount is used | [optional] 
+**rebated_fee** | **str** | Rebated fee | [optional] 
+**rebated_fee_currency** | **str** | Rebated fee currency unit | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/CurrencyPair.md b/docs/CurrencyPair.md
@@ -11,6 +11,7 @@ Name | Type | Description | Notes
 **min_quote_amount** | **str** | Minimum amount of quote currency to trade, &#x60;null&#x60; means no limit | [optional] 
 **amount_precision** | **int** | Amount scale | [optional] 
 **precision** | **int** | Price scale | [optional] 
+**trade_status** | **str** | How currency pair can be traded  - untradable: cannot be bought or sold - buyable: can be bought - sellable: can be sold - tradable: can be bought or sold | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/docs/Order.md b/docs/Order.md
@@ -14,14 +14,17 @@ Name | Type | Description | Notes
 **side** | **str** | Order side | 
 **amount** | **str** | Trade amount | 
 **price** | **str** | Order price | 
-**time_in_force** | **str** | Time in force | [optional] [default to 'gtc']
-**auto_borrow** | **bool** | Used in margin trading(e.g. &#x60;account&#x60; is &#x60;margin&#x60;) to allow automatic loan of lacked part if balance is not enough. | [optional] 
+**time_in_force** | **str** | Time in force  - gtc: GoodTillCancelled - ioc: ImmediateOrCancelled, taker only - poc: PendingOrCancelled, reduce only | [optional] [default to 'gtc']
+**auto_borrow** | **bool** | Used in margin trading(e.g. &#x60;account&#x60; is &#x60;margin&#x60;) to allow automatic loan of insufficient part if balance is not enough. | [optional] 
 **left** | **str** | Amount left to fill | [optional] 
 **fill_price** | **str** | Total filled in quote currency | [optional] 
 **fee** | **str** | Fee deducted | [optional] 
 **fee_currency** | **str** | Fee currency unit | [optional] 
 **point_fee** | **str** | Point used to deduct fee | [optional] 
 **gt_fee** | **str** | GT used to deduct fee | [optional] 
+**gt_discount** | **bool** | Whether GT fee discount is used | [optional] 
+**rebated_fee** | **str** | Rebated fee | [optional] 
+**rebated_fee_currency** | **str** | Rebated fee currency unit | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/gate_api/__init__.py b/gate_api/__init__.py
@@ -14,7 +14,7 @@
 
 from __future__ import absolute_import
 
-__version__ = "4.10.0"
+__version__ = "4.11.0"
 
 # import apis into sdk package
 from gate_api.api.futures_api import FuturesApi
diff --git a/gate_api/api_client.py b/gate_api/api_client.py
@@ -75,7 +75,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None,
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/4.10.0/python'
+        self.user_agent = 'OpenAPI-Generator/4.11.0/python'
 
     def __del__(self):
         if self._pool:
diff --git a/gate_api/configuration.py b/gate_api/configuration.py
@@ -248,6 +248,6 @@ def to_debug_report(self):
         return "Python SDK Debug Report:\n"\
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
-               "Version of the API: 4.10.0\n"\
-               "SDK Package Version: 4.10.0".\
+               "Version of the API: 4.11.0\n"\
+               "SDK Package Version: 4.11.0".\
                format(env=sys.platform, pyversion=sys.version)
diff --git a/gate_api/models/batch_order.py b/gate_api/models/batch_order.py
@@ -52,7 +52,10 @@ class BatchOrder(object):
         'fee': 'str',
         'fee_currency': 'str',
         'point_fee': 'str',
-        'gt_fee': 'str'
+        'gt_fee': 'str',
+        'gt_discount': 'bool',
+        'rebated_fee': 'str',
+        'rebated_fee_currency': 'str'
     }
 
     attribute_map = {
@@ -77,10 +80,13 @@ class BatchOrder(object):
         'fee': 'fee',
         'fee_currency': 'fee_currency',
         'point_fee': 'point_fee',
-        'gt_fee': 'gt_fee'
+        'gt_fee': 'gt_fee',
+        'gt_discount': 'gt_discount',
+        'rebated_fee': 'rebated_fee',
+        'rebated_fee_currency': 'rebated_fee_currency'
     }
 
-    def __init__(self, text=None, succeeded=None, label=None, message=None, id=None, create_time=None, update_time=None, status=None, currency_pair=None, type='limit', account='spot', side=None, amount=None, price=None, time_in_force='gtc', auto_borrow=None, left=None, fill_price=None, fee=None, fee_currency=None, point_fee=None, gt_fee=None):  # noqa: E501
+    def __init__(self, text=None, succeeded=None, label=None, message=None, id=None, create_time=None, update_time=None, status=None, currency_pair=None, type='limit', account='spot', side=None, amount=None, price=None, time_in_force='gtc', auto_borrow=None, left=None, fill_price=None, fee=None, fee_currency=None, point_fee=None, gt_fee=None, gt_discount=None, rebated_fee=None, rebated_fee_currency=None):  # noqa: E501
         """BatchOrder - a model defined in OpenAPI"""  # noqa: E501
 
         self._text = None
@@ -105,6 +111,9 @@ def __init__(self, text=None, succeeded=None, label=None, message=None, id=None,
         self._fee_currency = None
         self._point_fee = None
         self._gt_fee = None
+        self._gt_discount = None
+        self._rebated_fee = None
+        self._rebated_fee_currency = None
         self.discriminator = None
 
         if text is not None:
@@ -151,6 +160,12 @@ def __init__(self, text=None, succeeded=None, label=None, message=None, id=None,
             self.point_fee = point_fee
         if gt_fee is not None:
             self.gt_fee = gt_fee
+        if gt_discount is not None:
+            self.gt_discount = gt_discount
+        if rebated_fee is not None:
+            self.rebated_fee = rebated_fee
+        if rebated_fee_currency is not None:
+            self.rebated_fee_currency = rebated_fee_currency
 
     @property
     def text(self):
@@ -502,7 +517,7 @@ def price(self, price):
     def time_in_force(self):
         """Gets the time_in_force of this BatchOrder.  # noqa: E501
 
-        Time in force  # noqa: E501
+        Time in force  - gtc: GoodTillCancelled - ioc: ImmediateOrCancelled, taker only - poc: PendingOrCancelled, reduce only  # noqa: E501
 
         :return: The time_in_force of this BatchOrder.  # noqa: E501
         :rtype: str
@@ -513,12 +528,12 @@ def time_in_force(self):
     def time_in_force(self, time_in_force):
         """Sets the time_in_force of this BatchOrder.
 
-        Time in force  # noqa: E501
+        Time in force  - gtc: GoodTillCancelled - ioc: ImmediateOrCancelled, taker only - poc: PendingOrCancelled, reduce only  # noqa: E501
 
         :param time_in_force: The time_in_force of this BatchOrder.  # noqa: E501
         :type: str
         """
-        allowed_values = ["gtc", "ioc"]  # noqa: E501
+        allowed_values = ["gtc", "ioc", "poc"]  # noqa: E501
         if time_in_force not in allowed_values:
             raise ValueError(
                 "Invalid value for `time_in_force` ({0}), must be one of {1}"  # noqa: E501
@@ -531,7 +546,7 @@ def time_in_force(self, time_in_force):
     def auto_borrow(self):
         """Gets the auto_borrow of this BatchOrder.  # noqa: E501
 
-        Used in margin trading(e.g. `account` is `margin`) to allow automatic loan of lacked part if balance is not enough.  # noqa: E501
+        Used in margin trading(e.g. `account` is `margin`) to allow automatic loan of insufficient part if balance is not enough.  # noqa: E501
 
         :return: The auto_borrow of this BatchOrder.  # noqa: E501
         :rtype: bool
@@ -542,7 +557,7 @@ def auto_borrow(self):
     def auto_borrow(self, auto_borrow):
         """Sets the auto_borrow of this BatchOrder.
 
-        Used in margin trading(e.g. `account` is `margin`) to allow automatic loan of lacked part if balance is not enough.  # noqa: E501
+        Used in margin trading(e.g. `account` is `margin`) to allow automatic loan of insufficient part if balance is not enough.  # noqa: E501
 
         :param auto_borrow: The auto_borrow of this BatchOrder.  # noqa: E501
         :type: bool
@@ -688,6 +703,75 @@ def gt_fee(self, gt_fee):
 
         self._gt_fee = gt_fee
 
+    @property
+    def gt_discount(self):
+        """Gets the gt_discount of this BatchOrder.  # noqa: E501
+
+        Whether GT fee discount is used  # noqa: E501
+
+        :return: The gt_discount of this BatchOrder.  # noqa: E501
+        :rtype: bool
+        """
+        return self._gt_discount
+
+    @gt_discount.setter
+    def gt_discount(self, gt_discount):
+        """Sets the gt_discount of this BatchOrder.
+
+        Whether GT fee discount is used  # noqa: E501
+
+        :param gt_discount: The gt_discount of this BatchOrder.  # noqa: E501
+        :type: bool
+        """
+
+        self._gt_discount = gt_discount
+
+    @property
+    def rebated_fee(self):
+        """Gets the rebated_fee of this BatchOrder.  # noqa: E501
+
+        Rebated fee  # noqa: E501
+
+        :return: The rebated_fee of this BatchOrder.  # noqa: E501
+        :rtype: str
+        """
+        return self._rebated_fee
+
+    @rebated_fee.setter
+    def rebated_fee(self, rebated_fee):
+        """Sets the rebated_fee of this BatchOrder.
+
+        Rebated fee  # noqa: E501
+
+        :param rebated_fee: The rebated_fee of this BatchOrder.  # noqa: E501
+        :type: str
+        """
+
+        self._rebated_fee = rebated_fee
+
+    @property
+    def rebated_fee_currency(self):
+        """Gets the rebated_fee_currency of this BatchOrder.  # noqa: E501
+
+        Rebated fee currency unit  # noqa: E501
+
+        :return: The rebated_fee_currency of this BatchOrder.  # noqa: E501
+        :rtype: str
+        """
+        return self._rebated_fee_currency
+
+    @rebated_fee_currency.setter
+    def rebated_fee_currency(self, rebated_fee_currency):
+        """Sets the rebated_fee_currency of this BatchOrder.
+
+        Rebated fee currency unit  # noqa: E501
+
+        :param rebated_fee_currency: The rebated_fee_currency of this BatchOrder.  # noqa: E501
+        :type: str
+        """
+
+        self._rebated_fee_currency = rebated_fee_currency
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/gate_api/models/currency_pair.py b/gate_api/models/currency_pair.py
@@ -38,7 +38,8 @@ class CurrencyPair(object):
         'min_base_amount': 'str',
         'min_quote_amount': 'str',
         'amount_precision': 'int',
-        'precision': 'int'
+        'precision': 'int',
+        'trade_status': 'str'
     }
 
     attribute_map = {
@@ -49,10 +50,11 @@ class CurrencyPair(object):
         'min_base_amount': 'min_base_amount',
         'min_quote_amount': 'min_quote_amount',
         'amount_precision': 'amount_precision',
-        'precision': 'precision'
+        'precision': 'precision',
+        'trade_status': 'trade_status'
     }
 
-    def __init__(self, id=None, base=None, quote=None, fee=None, min_base_amount=None, min_quote_amount=None, amount_precision=None, precision=None):  # noqa: E501
+    def __init__(self, id=None, base=None, quote=None, fee=None, min_base_amount=None, min_quote_amount=None, amount_precision=None, precision=None, trade_status=None):  # noqa: E501
         """CurrencyPair - a model defined in OpenAPI"""  # noqa: E501
 
         self._id = None
@@ -63,6 +65,7 @@ def __init__(self, id=None, base=None, quote=None, fee=None, min_base_amount=Non
         self._min_quote_amount = None
         self._amount_precision = None
         self._precision = None
+        self._trade_status = None
         self.discriminator = None
 
         if id is not None:
@@ -81,6 +84,8 @@ def __init__(self, id=None, base=None, quote=None, fee=None, min_base_amount=Non
             self.amount_precision = amount_precision
         if precision is not None:
             self.precision = precision
+        if trade_status is not None:
+            self.trade_status = trade_status
 
     @property
     def id(self):
@@ -266,6 +271,35 @@ def precision(self, precision):
 
         self._precision = precision
 
+    @property
+    def trade_status(self):
+        """Gets the trade_status of this CurrencyPair.  # noqa: E501
+
+        How currency pair can be traded  - untradable: cannot be bought or sold - buyable: can be bought - sellable: can be sold - tradable: can be bought or sold  # noqa: E501
+
+        :return: The trade_status of this CurrencyPair.  # noqa: E501
+        :rtype: str
+        """
+        return self._trade_status
+
+    @trade_status.setter
+    def trade_status(self, trade_status):
+        """Sets the trade_status of this CurrencyPair.
+
+        How currency pair can be traded  - untradable: cannot be bought or sold - buyable: can be bought - sellable: can be sold - tradable: can be bought or sold  # noqa: E501
+
+        :param trade_status: The trade_status of this CurrencyPair.  # noqa: E501
+        :type: str
+        """
+        allowed_values = ["untradable", "buyable", "sellable", "tradable"]  # noqa: E501
+        if trade_status not in allowed_values:
+            raise ValueError(
+                "Invalid value for `trade_status` ({0}), must be one of {1}"  # noqa: E501
+                .format(trade_status, allowed_values)
+            )
+
+        self._trade_status = trade_status
+
     def to_dict(self):
         """Returns the model properties as a dict"""
         result = {}
diff --git a/gate_api/models/order.py b/gate_api/models/order.py
diff --git a/setup.py b/setup.py
