python-okx 0.3.4__py3-none-any.whl → 0.3.6__py3-none-any.whl

okx/Account.py

@@ -5,7 +5,7 @@ from .okxclient import OkxClient
 class AccountAPI(OkxClient):
 
     def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1',
-                 domain='https://www.okx.com', debug=True, proxy=None):
+                 domain='https://www.okx.com', debug=False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
     # Get Positions
@@ -217,6 +217,13 @@ class AccountAPI(OkxClient):
         }
         return self._request_with_params(POST, SET_AUTO_LOAN, params)
 
+    # - Set auto loan
+    def set_account_level(self, acctLv):
+        params = {
+            'acctLv': acctLv
+        }
+        return self._request_with_params(POST, SET_ACCOUNT_LEVEL, params)
+
     # - Activate option
     def activate_option(self):
         return self._request_without_params(POST, ACTIVSTE_OPTION)

okx/BlockTrading.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class BlockTradingAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
     def counterparties(self):

okx/Convert.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class ConvertAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True,proxy = None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False,proxy = None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
     def get_currencies(self):

okx/CopyTrading.py

@@ -4,7 +4,7 @@ from .consts import *
 
 class CopyTradingAPI(OkxClient):
     def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=False, flag='1',
-                 domain='https://www.okx.com', debug=True, proxy=None):
+                 domain='https://www.okx.com', debug=False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug,
                            proxy=proxy)
 

okx/FDBroker.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class FDBrokerAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
     def generate_rebate_details_download_link(self, begin ='', end = ''):

okx/Finance/EthStaking.py

@@ -0,0 +1,52 @@
+from okx.okxclient import OkxClient
+from okx.consts import *
+
+
+class EthStakingAPI(OkxClient):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
+        OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
+
+    def eth_product_info(self):
+
+        return self._request_without_params(GET, STACK_ETH_PRODUCT_INFO)
+
+    def eth_purchase(self, amt=''):
+
+        params = {
+            'amt': amt,
+        }
+        return self._request_with_params(POST, STACK_ETH_PURCHASE, params)
+
+    def eth_redeem(self, amt=''):
+
+        params = {
+            'amt': amt,
+        }
+        return self._request_with_params(POST, STACK_ETH_REDEEM, params)
+
+    def eth_balance(self):
+
+        params = {}
+        return self._request_with_params(GET, STACK_ETH_BALANCE, params)
+
+    def eth_purchase_redeem_history(self, type='', status='', after='', before='', limit=''):
+
+        params = {}
+        if type != '':
+            params['type'] = type
+        if status != '':
+            params['status'] = status
+        if after != '':
+            params['after'] = after
+        if before != '':
+            params['before'] = before
+        if limit != '':
+            params['limit'] = limit
+        return self._request_with_params(GET, STACK_ETH_PURCHASE_REDEEM_HISTORY, params)
+
+    def eth_apy_history(self, days):
+
+        params = {
+            'days': days,
+        }
+        return self._request_with_params(GET, STACK_ETH_APY_HISTORY, params)

okx/Finance/Savings.py

@@ -0,0 +1,62 @@
+from okx.okxclient import OkxClient
+from okx.consts import *
+
+
+class SavingsAPI(OkxClient):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
+        OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
+
+    # - Get saving balance
+    def get_saving_balance(self, ccy=''):
+        params = {
+            'ccy': ccy
+        }
+        return self._request_with_params(GET, GET_SAVING_BALANCE, params)
+
+    # - Savings purchase/redemption
+    def savings_purchase_redemption(self, ccy='', amt='', side='', rate=''):
+
+        params = {
+            'ccy': ccy,
+            'amt': amt,
+            'side': side,
+            'rate': rate
+        }
+        return self._request_with_params(POST, SAVING_PURCHASE_REDEMPTION, params)
+
+    # - Set lending rate
+    def set_lending_rate(self, ccy='', rate=''):
+        params = {
+            'ccy': ccy,
+            'rate': rate
+        }
+        return self._request_with_params(POST, SET_LENDING_RATE, params)
+
+    # - Get lending history
+    def get_lending_history(self, ccy='', after='', before='', limit=''):
+        params = {
+            'ccy': ccy,
+            'after': after,
+            'before': before,
+            'limit': limit
+        }
+        return self._request_with_params(GET, GET_LENDING_HISTORY, params)
+
+    # - Get public borrow history (public)
+    def get_public_borrow_history(self, ccy='', after='', before='', limit=''):
+        params = {
+            'ccy': ccy,
+            'after': after,
+            'before': before,
+            'limit': limit
+        }
+        return self._request_with_params(GET, GET_PUBLIC_BORROW_HISTORY, params)
+
+    # GET / Public borrow info (public)
+    def get_public_borrow_info(self, ccy=''):
+        params = {
+            'ccy': ccy
+        }
+        return self._request_with_params(GET, GET_PUBLIC_BORROW_INFO, params)
+
+

okx/Finance/SolStaking.py

@@ -0,0 +1,48 @@
+from okx.okxclient import OkxClient
+from okx.consts import *
+
+
+class SolStakingAPI(OkxClient):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
+        OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
+
+    def sol_purchase(self, amt):
+
+        params = {
+            'amt': amt,
+        }
+        return self._request_with_params(POST, STACK_SOL_PURCHASE, params)
+
+    def sol_redeem(self, amt=''):
+
+        params = {
+            'amt': amt,
+        }
+        return self._request_with_params(POST, STACK_SOL_REDEEM, params)
+
+    def sol_balance(self):
+
+        params = {}
+        return self._request_with_params(GET, STACK_SOL_BALANCE, params)
+
+    def sol_purchase_redeem_history(self, type='', status='', after='', before='', limit=''):
+
+        params = {}
+        if type != '':
+            params['type'] = type
+        if status != '':
+            params['status'] = status
+        if after != '':
+            params['after'] = after
+        if before != '':
+            params['before'] = before
+        if limit != '':
+            params['limit'] = limit
+        return self._request_with_params(GET, STACK_SOL_PURCHASE_REDEEM_HISTORY, params)
+
+    def sol_apy_history(self, days):
+
+        params = {
+            'days': days,
+        }
+        return self._request_with_params(GET, STACK_SOL_APY_HISTORY, params)

okx/Finance/StakingDefi.py

@@ -0,0 +1,63 @@
+from okx.okxclient import OkxClient
+from okx.consts import *
+
+
+class StakingDefiAPI(OkxClient):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
+        OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
+
+    def get_offers(self, productId='', protocolType='', ccy=''):
+        params = {
+            'productId': productId,
+            'protocolType': protocolType,
+            'ccy': ccy
+        }
+        return self._request_with_params(GET, STACK_DEFI_OFFERS, params)
+
+    def purchase(self, productId='', investData=[], term='', tag=''):
+
+        params = {
+            'productId': productId,
+            'investData': investData
+        }
+        if term != '':
+            params['term'] = term
+        if tag != '':
+            params['tag'] = tag
+        return self._request_with_params(POST, STACK_DEFI_PURCHASE, params)
+
+    def redeem(self, ordId='', protocolType='', allowEarlyRedeem=''):
+        params = {
+            'ordId': ordId,
+            'protocolType': protocolType,
+            'allowEarlyRedeem': allowEarlyRedeem
+        }
+        return self._request_with_params(POST, STACK_DEFI_REDEEM, params)
+
+    def cancel(self, ordId='', protocolType=''):
+        params = {
+            'ordId': ordId,
+            'protocolType': protocolType
+        }
+        return self._request_with_params(POST, STACK_DEFI_CANCEL, params)
+
+    def get_activity_orders(self, productId='', protocolType='', ccy='', state=''):
+        params = {
+            'productId': productId,
+            'protocolType': protocolType,
+            'ccy': ccy,
+            'state': state
+        }
+        return self._request_with_params(GET, STACK_DEFI_ORDERS_ACTIVITY, params)
+
+    def get_orders_history(self, productId='', protocolType='', ccy='', after='', before='', limit=''):
+        params = {
+            'productId': productId,
+            'protocolType': protocolType,
+            'ccy': ccy,
+            'after': after,
+            'before': before,
+            'limit': limit
+        }
+        return self._request_with_params(GET, STACK_DEFI_ORDERS_HISTORY, params)
+

okx/Funding.py

@@ -5,7 +5,7 @@ from .consts import *
 class FundingAPI(OkxClient):
 
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
     # Get Non Tradable Assets
@@ -41,8 +41,8 @@ class FundingAPI(OkxClient):
         return self._request_with_params(POST, WITHDRAWAL_COIN, params)
 
     # Get Deposit History
-    def get_deposit_history(self, ccy='', state='', after='', before='', limit='', txId='', depId='', fromWdId=''):
-        params = {'ccy': ccy, 'state': state, 'after': after, 'before': before, 'limit': limit, 'txId': txId,
+    def get_deposit_history(self, ccy='', type='', state='', after='', before='', limit='', txId='', depId='', fromWdId=''):
+        params = {'ccy': ccy, 'type': type, 'state': state, 'after': after, 'before': before, 'limit': limit, 'txId': txId,
                   'depId': depId, 'fromWdId': fromWdId}
         return self._request_with_params(GET, DEPOSIT_HISTORY, params)
 

okx/Grid.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class GridAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
     def grid_order_algo(self, instId='', algoOrdType='', maxPx='', minPx='', gridNum='', runType='', tpTriggerPx='',

okx/MarketData.py

@@ -4,7 +4,7 @@ from .consts import *
 
 class MarketAPI(OkxClient):
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
 

okx/PublicData.py

@@ -4,7 +4,7 @@ from .consts import *
 
 class PublicAPI(OkxClient):
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
     # Get Instruments

okx/SimpleEarnFixed.py

@@ -5,7 +5,7 @@ from okx.okxclient import OkxClient
 
 class SimpleEarnFixedAPI(OkxClient):
     def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1',
-                 domain='https://www.okx.com', debug=True, proxy=None):
+                 domain='https://www.okx.com', debug=False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
     def get_lending_offers(self, ccy=None, term=None):

okx/SpreadTrading.py

@@ -4,7 +4,7 @@ from .consts import *
 
 class SpreadTradingAPI(OkxClient):
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
     # Place Order

okx/Status.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class StatusAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
     def status(self, state=''):

okx/SubAccount.py

@@ -3,7 +3,7 @@ from .consts import *
 
 
 class SubAccountAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
     def get_account_balance(self, subAcct):

okx/Trade.py

@@ -7,7 +7,7 @@ from .consts import *
 class TradeAPI(OkxClient):
 
     def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1',
-                 domain='https://www.okx.com', debug=True, proxy=None):
+                 domain='https://www.okx.com', debug=False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
     # Place Order
@@ -39,11 +39,11 @@ class TradeAPI(OkxClient):
     # Amend Order
     def amend_order(self, instId, cxlOnFail='', ordId='', clOrdId='', reqId='', newSz='', newPx='', newTpTriggerPx='',
                     newTpOrdPx='', newSlTriggerPx='', newSlOrdPx='', newTpTriggerPxType='', newSlTriggerPxType='',
-                    attachAlgoOrds=''):
+                    attachAlgoOrds='', newTriggerPx='', newOrdPx=''):
         params = {'instId': instId, 'cxlOnFail': cxlOnFail, 'ordId': ordId, 'clOrdId': clOrdId, 'reqId': reqId,
                   'newSz': newSz, 'newPx': newPx, 'newTpTriggerPx': newTpTriggerPx, 'newTpOrdPx': newTpOrdPx,
                   'newSlTriggerPx': newSlTriggerPx, 'newSlOrdPx': newSlOrdPx, 'newTpTriggerPxType': newTpTriggerPxType,
-                  'newSlTriggerPxType': newSlTriggerPxType}
+                  'newSlTriggerPxType': newSlTriggerPxType, 'newTriggerPx': newTriggerPx, 'newOrdPx': newOrdPx}
         params['attachAlgoOrds'] = attachAlgoOrds
         return self._request_with_params(POST, AMEND_ORDER, params)
 

okx/TradingData.py

@@ -4,7 +4,7 @@ from .consts import *
 
 class TradingDataAPI(OkxClient):
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = False, proxy=None):
         OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
 
 

okx/__init__.py

@@ -2,4 +2,4 @@
 Python SDK for the OKX API v5
 
 """
-__version__="0.3.4"
+__version__="0.3.6"

okx/consts.py

@@ -52,6 +52,7 @@ GET_VIP_LOAN_ORDER_LIST= '/api/v5/account/vip-loan-order-list'
 GET_VIP_LOAN_ORDER_DETAIL= '/api/v5/account/vip-loan-order-detail'
 SET_RISK_OFFSET_TYPE = '/api/v5/account/set-riskOffset-type'
 SET_AUTO_LOAN = '/api/v5/account/set-auto-loan'
+SET_ACCOUNT_LEVEL = '/api/v5/account/set-account-level'
 ACTIVSTE_OPTION = '/api/v5/account/activate-option'
 POSITION_BUILDER = '/api/v5/account/position-builder'
 GET_INSTRUMENTS = '/api/v5/account/instruments'
@@ -191,25 +192,6 @@ GET_THE_USER_AFFILIATE_REBATE = '/api/v5/users/partner/if-rebate'
 SET_SUB_ACCOUNTS_VIP_LOAN = '/api/v5/account/subaccount/set-loan-allocation'
 GET_SUB_ACCOUNT_BORROW_INTEREST_AND_LIMIT = '/api/v5/account/subaccount/interest-limits'
 
-# Broker-all need to implmented-completed
-BROKER_INFO = '/api/v5/broker/nd/info'
-CREATE_SUBACCOUNT = '/api/v5/broker/nd/create-subaccount'
-DELETE_SUBACCOUNT = '/api/v5/broker/nd/delete-subaccount'
-SUBACCOUNT_INFO = '/api/v5/broker/nd/subaccount-info'
-SET_SUBACCOUNT_LEVEL = '/api/v5/broker/nd/set-subaccount-level'
-SET_SUBACCOUNT_FEE_REAT = '/api/v5/broker/nd/set-subaccount-fee-rate'
-SUBACCOUNT_DEPOSIT_ADDRESS = '/api/v5/asset/broker/nd/subaccount-deposit-address'
-SUBACCOUNT_DEPOSIT_HISTORY = '/api/v5/asset/broker/nd/subaccount-deposit-history'
-REBATE_DAILY = '/api/v5/broker/nd/rebate-daily'
-ND_CREAET_APIKEY = '/api/v5/broker/nd/subaccount/apikey'
-ND_SELECT_APIKEY = '/api/v5/broker/nd/subaccount/apikey'
-ND_MODIFY_APIKEY = '/api/v5/broker/nd/subaccount/modify-apikey'
-ND_DELETE_APIKEY = '/api/v5/broker/nd/subaccount/delete-apikey'
-GET_REBATE_PER_ORDERS = '/api/v5/broker/nd/rebate-per-orders'
-REBATE_PER_ORDERS = '/api/v5/broker/nd/rebate-per-orders'
-MODIFY_SUBACCOUNT_DEPOSIT_ADDRESS = '/api/v5/asset/broker/nd/modify-subaccount-deposit-address'
-GET_SUBACCOUNT_DEPOSIT='/api/v5/asset/broker/nd/subaccount-deposit-address'
-
 # Convert-Complete
 GET_CURRENCIES = '/api/v5/asset/convert/currencies'
 GET_CURRENCY_PAIR = '/api/v5/asset/convert/currency-pair'
@@ -275,6 +257,17 @@ SET_LENDING_RATE = '/api/v5/finance/savings/set-lending-rate'
 GET_LENDING_HISTORY = '/api/v5/finance/savings/lending-history'
 GET_PUBLIC_BORROW_INFO = '/api/v5/finance/savings/lending-rate-summary'
 GET_PUBLIC_BORROW_HISTORY = '/api/v5/finance/savings/lending-rate-history'
+STACK_ETH_PRODUCT_INFO = '/api/v5/finance/staking-defi/eth/product-info'
+STACK_ETH_PURCHASE = '/api/v5/finance/staking-defi/eth/purchase'
+STACK_ETH_REDEEM = '/api/v5/finance/staking-defi/eth/redeem'
+STACK_ETH_BALANCE = '/api/v5/finance/staking-defi/eth/balance'
+STACK_ETH_PURCHASE_REDEEM_HISTORY = '/api/v5/finance/staking-defi/eth/purchase-redeem-history'
+STACK_ETH_APY_HISTORY = '/api/v5/finance/staking-defi/eth/apy-history'
+STACK_SOL_PURCHASE = '/api/v5/finance/staking-defi/sol/purchase'
+STACK_SOL_REDEEM = '/api/v5/finance/staking-defi/sol/redeem'
+STACK_SOL_BALANCE = '/api/v5/finance/staking-defi/sol/balance'
+STACK_SOL_PURCHASE_REDEEM_HISTORY = '/api/v5/finance/staking-defi/sol/purchase-redeem-history'
+STACK_SOL_APY_HISTORY = '/api/v5/finance/staking-defi/sol/apy-history'
 
 # status-complete
 STATUS = '/api/v5/system/status'

okx/okxclient.py

@@ -13,7 +13,7 @@ from . import consts as c, utils, exceptions
 
 class OkxClient(Client):
 
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1',base_api=c.API_URL, debug='True', proxy=None):
+    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1',base_api=c.API_URL, debug=False, proxy=None):
         super().__init__(base_url=base_api, http2=True, proxy=proxy)
         self.API_KEY = api_key
         self.API_SECRET_KEY = api_secret_key

okx/websocket/WebSocketFactory.py

@@ -5,8 +5,7 @@ import ssl
 import certifi
 import websockets
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger("WebSocketFactory")
+logger = logging.getLogger(__name__)
 
 
 class WebSocketFactory:

okx/websocket/WsPrivateAsync.py

@@ -5,8 +5,7 @@ import logging
 from okx.websocket import WsUtils
 from okx.websocket.WebSocketFactory import WebSocketFactory
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger("WsPrivate")
+logger = logging.getLogger(__name__)
 
 
 class WsPrivateAsync:
@@ -26,7 +25,7 @@ class WsPrivateAsync:
 
     async def consume(self):
         async for message in self.websocket:
-            logger.info("Received message: {%s}", message)
+            logger.debug("Received message: {%s}", message)
             if self.callback:
                 self.callback(message)
 

okx/websocket/WsPublicAsync.py

@@ -4,8 +4,7 @@ import logging
 
 from okx.websocket.WebSocketFactory import WebSocketFactory
 
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger("WsPublic")
+logger = logging.getLogger(__name__)
 
 
 class WsPublicAsync:
@@ -21,7 +20,7 @@ class WsPublicAsync:
 
     async def consume(self):
         async for message in self.websocket:
-            logger.info("Received message: {%s}", message)
+            logger.debug("Received message: {%s}", message)
             if self.callback:
                 self.callback(message)
 

{python_okx-0.3.4.dist-info → python_okx-0.3.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-okx
-Version: 0.3.4
+Version: 0.3.6
 Summary: Python SDK for OKX
 Home-page: https://okx.com/docs-v5/
 Author: okxv5api

python_okx-0.3.6.dist-info/RECORD

@@ -0,0 +1,34 @@
+okx/Account.py,sha256=7hMU6Bt-5ogC-FUGAyiPDLsvQQsB8Tvm7K8AZdnSzaE,14080
+okx/BlockTrading.py,sha256=A4OcuLuEHucAIhc8doPGr2o6dsCjVbv-a6YiTlzwdEw,4128
+okx/Convert.py,sha256=xEB2pwEUpc-k23hA3mYIe3EKB5szIXlEe96JFiRSPpc,1575
+okx/CopyTrading.py,sha256=Mso5GE9UQTJVrL4V3jIyU1QWBtzr-m32edrGDoRHk84,2751
+okx/FDBroker.py,sha256=nUpcR_XtUcKa1Jk_B1OUZCjiv9ifQnxGRsLNHDxdGno,788
+okx/Funding.py,sha256=7LqfuqIXm_fP4Drd8IyCmx_x0RX1KfuwMLoIUlqQrv8,6284
+okx/Grid.py,sha256=r8cZidY2okqrb-zpyTsFJrecPzw2s25ySH3tOBDnDtA,6691
+okx/MarketData.py,sha256=n9AgxmFyr4GoDQjxkKdryInDhnYfGcxeBrWZSMHu8kI,4928
+okx/PublicData.py,sha256=HEq4cNCk5P1mhLaMewJhVJTvHm0I2bdrL8Z6pH3yYn0,5136
+okx/SimpleEarnFixed.py,sha256=DKROSJV_WTlHalCY0BoBG4euruBVKUn-2xTIu9XYCWE,3435
+okx/SpreadTrading.py,sha256=Dy7VZ8WK4HyxhMvLY1G5RukRHI_T3d0fnrHZifv9Uyw,3227
+okx/Status.py,sha256=hGnn-tw302xXCDWly7LssaG3-29HcHZRhrBFUuGrSS0,495
+okx/SubAccount.py,sha256=SMMPdkatDyRE0_7mDqK8orzt29hti2TTTWNayLT3F0g,3528
+okx/Trade.py,sha256=jn06cUm3LkFvksn3O8WuiQH7t7npkEf30Z8CFsFMcKI,10921
+okx/TradingData.py,sha256=ig9Y3f-CH_nyBvoZCF4M9z2_wQXF-r0On7p9EMMuDMo,2331
+okx/__init__.py,sha256=4wN5G40NuTJe6tNwmnwQoT0Ilf_vNFcpR208BwoBPJs,58
+okx/consts.py,sha256=BmkSlLGhiwgCXQO_xIeQ1e6QbP0UO_jumQvMXyIxRAs,15301
+okx/exceptions.py,sha256=ERuCnvnudJNBNACh3LNE3km5GJy0BGC5C3OKjgHXFaU,1182
+okx/okxclient.py,sha256=wJD8gTyHs92WjLffANbWLCgfX4Mnxh-IKnnJ2nUYHsI,2597
+okx/utils.py,sha256=FTXSW73yXV6Hc4-9O22WFmkhayASYo7WQHIc_bTyc6g,1858
+okx/Finance/EthStaking.py,sha256=hOl_i4VOBjejeyBboG1-37rhVnlSoOZ44e-Jzger-bQ,1612
+okx/Finance/Savings.py,sha256=qZbv-KzgGt_me8RZePDSUiRCI1mbz692EK2ZhfYiH8c,1999
+okx/Finance/SolStaking.py,sha256=XuGFFonpRpMQkrhNlpyOb644EApb3joQ74PRabN0PTs,1502
+okx/Finance/StakingDefi.py,sha256=eWyAAmMDht4B4N5VWf3bj3FxSBETMXaay-Luu4GN3ls,2250
+okx/Finance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+okx/websocket/WebSocketFactory.py,sha256=ba0ZNUggghZ_YlWYB7g8UCv6MewqVr9wn75YOtIU5kE,845
+okx/websocket/WsPrivateAsync.py,sha256=zmZuInowW9_YWpQoZoicbbff-UwWvWxOluKclomNcXA,2240
+okx/websocket/WsPublicAsync.py,sha256=yDk_2jkgM4M_sq6zSL6i-KfdoSOaSd5KsmA1wqbIx3E,1520
+okx/websocket/WsUtils.py,sha256=ynkCtfvkrwBUiCi-_yqp1xTn3hhVd_o5ITIhD1xLdBo,2199
+okx/websocket/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_okx-0.3.6.dist-info/METADATA,sha256=4T8s6gigyq0tHZN-KBTU6qlOSjbNA5Zjw8UUZF9Ri08,3145
+python_okx-0.3.6.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+python_okx-0.3.6.dist-info/top_level.txt,sha256=rrbhHZwiw4YlhG1LWWaAODvRxyZr3onxFnqwsHdikDc,4
+python_okx-0.3.6.dist-info/RECORD,,

okx/Earning.py

@@ -1,115 +0,0 @@
-from .okxclient import OkxClient
-from .consts import *
-
-
-class EarningAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
-        OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
-
-    def get_offers(self,productId = '',protocolType = '',ccy = ''):
-        params = {
-            'productId':productId,
-            'protocolType':protocolType,
-            'ccy':ccy
-        }
-        return self._request_with_params(GET,STACK_DEFI_OFFERS,params)
-
-    def purchase(self, productId='', investData=[], term='', tag=''):
-
-        params = {
-            'productId': productId,
-            'investData': investData
-        }
-        if term != '':
-            params['term'] = term
-        if tag != '':
-            params['tag'] = tag
-        return self._request_with_params(POST, STACK_DEFI_PURCHASE, params)
-
-    def redeem(self,ordId = '',protocolType = '',allowEarlyRedeem = ''):
-        params = {
-            'ordId':ordId,
-            'protocolType':protocolType,
-            'allowEarlyRedeem':allowEarlyRedeem
-        }
-        return self._request_with_params(POST,STACK_DEFI_REDEEM,params)
-
-    def cancel(self,ordId = '',protocolType = ''):
-        params = {
-            'ordId':ordId,
-            'protocolType':protocolType
-        }
-        return self._request_with_params(POST,STACK_DEFI_CANCEL,params)
-
-    def get_activity_orders(self,productId = '',protocolType = '',ccy = '',state = ''):
-        params = {
-            'productId':productId,
-            'protocolType':protocolType,
-            'ccy':ccy,
-            'state':state
-        }
-        return self._request_with_params(GET,STACK_DEFI_ORDERS_ACTIVITY,params)
-
-    def get_orders_history(self,productId = '',protocolType = '',ccy = '',after = '',before = '',limit = ''):
-        params = {
-            'productId':productId,
-            'protocolType':protocolType,
-            'ccy':ccy,
-            'after':after,
-            'before':before,
-            'limit':limit
-        }
-        return self._request_with_params(GET,STACK_DEFI_ORDERS_HISTORY,params)
-
-    # - Get saving balance
-    def get_saving_balance(self, ccy=''):
-        params = {
-            'ccy': ccy
-        }
-        return self._request_with_params(GET, GET_SAVING_BALANCE, params)
-
-    # - Savings purchase/redemption
-    def savings_purchase_redemption(self, ccy='', amt='', side='', rate=''):
-
-        params = {
-            'ccy': ccy,
-            'amt': amt,
-            'side': side,
-            'rate': rate
-        }
-        return self._request_with_params(POST, SAVING_PURCHASE_REDEMPTION, params)
-
-    # - Set lending rate
-    def set_lending_rate(self, ccy='', rate=''):
-        params = {
-            'ccy': ccy,
-            'rate': rate
-        }
-        return self._request_with_params(POST, SET_LENDING_RATE, params)
-
-    # - Get lending history
-    def get_lending_history(self, ccy='', after='', before='', limit=''):
-        params = {
-            'ccy': ccy,
-            'after': after,
-            'before': before,
-            'limit': limit
-        }
-        return self._request_with_params(GET, GET_LENDING_HISTORY, params)
-
-    # - Get public borrow info (public)
-    def get_public_borrow_info(self, ccy=''):
-        params = {
-            'ccy': ccy
-        }
-        return self._request_with_params(GET, GET_PUBLIC_BORROW_INFO, params)
-
-    # - Get public borrow history (public)
-    def get_public_borrow_history(self, ccy='', after='', before='', limit=''):
-        params = {
-            'ccy': ccy,
-            'after': after,
-            'before': before,
-            'limit': limit
-        }
-        return self._request_with_params(GET, GET_PUBLIC_BORROW_HISTORY, params)

okx/NDBroker.py

@@ -1,150 +0,0 @@
-from .okxclient import OkxClient
-from .consts import *
-class NDBrokerAPI(OkxClient):
-    def __init__(self, api_key='-1', api_secret_key='-1', passphrase='-1', use_server_time=None, flag='1', domain = 'https://www.okx.com',debug = True, proxy=None):
-        OkxClient.__init__(self, api_key, api_secret_key, passphrase, use_server_time, flag, domain, debug, proxy)
-
-    #GET /api/v5/broker/nd/info
-    def get_broker_info(self):
-        return self._request_without_params(GET, BROKER_INFO)
-
-    #POST /api/v5/broker/nd/create-subaccount
-    def create_subaccount(self,subAcct = '',label = ''):
-        params = {
-            'subAcct':subAcct,
-            'label':label
-        }
-        return self._request_with_params(POST,CREATE_SUBACCOUNT,params)
-
-    def delete_subaccount(self,subAcct = ''):
-        params = {
-            'subAcct':subAcct
-        }
-        return self._request_with_params(POST,DELETE_SUBACCOUNT,params)
-
-    def get_subaccount_info(self,subAcct = '',page = '',limit = ''):
-        params = {
-            'subAcct':subAcct,
-            'page':page,
-            'limit':limit
-        }
-        return self._request_with_params(GET,SUBACCOUNT_INFO,params)
-
-    def create_subaccount_apikey(self,subAcct = '',label='',passphrase='',ip='',perm=''):
-        params = {
-            'subAcct':subAcct,
-            'label':label,
-            'passphrase':passphrase,
-            'ip':ip,
-            'perm':perm
-        }
-        return self._request_with_params(POST,ND_CREAET_APIKEY,params)
-
-    def get_subaccount_apikey(self,subAcct = '',apiKey = ''):
-        params = {
-            'subAcct':subAcct,
-            'apiKey':apiKey
-        }
-        return self._request_with_params(GET,ND_SELECT_APIKEY,params)
-
-    def reset_subaccount_apikey(self,subAcct = '',apiKey = '',label='',perm = '',ip = ''):
-        params = {
-            'subAcct':subAcct,
-            'apiKey':apiKey,
-            'label':label,
-            'perm':perm,
-            'ip':ip
-        }
-        return self._request_with_params(POST,ND_MODIFY_APIKEY,params)
-
-    def delete_subaccount_apikey(self,subAcct = '',apiKey = ''):
-        params = {
-            'subAcct':subAcct,
-            'apiKey':apiKey
-        }
-        return self._request_with_params(POST,ND_DELETE_APIKEY,params)
-
-    def set_subaccount_level(self,subAcct = '',acctLv = ''):
-        params = {
-            'subAcct':subAcct,
-            'acctLv':acctLv
-        }
-        return self._request_with_params(POST,SET_SUBACCOUNT_LEVEL,params)
-
-    def set_subaccount_fee_rate(self,subAcct = '',instType = '',chgType = '',chgTaker = '',chgMaker = '',effDate = ''):
-        params = {
-            'subAcct':subAcct,
-            'instType':instType,
-            'chgType':chgType,
-            'chgTaker':chgTaker,
-            'chgMaker':chgMaker,
-            'effDate':effDate
-        }
-        return self._request_with_params(POST,SET_SUBACCOUNT_FEE_REAT,params)
-
-    def create_subaccount_deposit_address(self,subAcct = '',ccy = '',chain = '',addrType = '', to =''):
-        params = {
-            'subAcct':subAcct,
-            'ccy':ccy,
-            'chain':chain,
-            'addrType':addrType,
-            'to':to
-        }
-        return self._request_with_params(POST,SUBACCOUNT_DEPOSIT_ADDRESS,params)
-
-    def reset_subaccount_deposit_address(self,subAcct = '',ccy = '',chain = '',addr = '',to = ''):
-        params = {
-            'subAcct':subAcct,
-            'ccy':ccy,
-            'chain':chain,
-            'addr':addr,
-            'to':to
-        }
-        return self._request_with_params(POST,MODIFY_SUBACCOUNT_DEPOSIT_ADDRESS,params)
-
-    def get_subaccount_deposit_address(self,subAcct = '',ccy = ''):
-        params = {
-            'subAcct':subAcct,
-            'ccy':ccy
-        }
-        return self._request_with_params(GET,GET_SUBACCOUNT_DEPOSIT,params)
-
-    def get_subaccount_deposit_history(self,subAcct = '',ccy = '',txId = '',state = '',after = '',before = '',limit = ''):
-        params = {
-            'subAcct':subAcct,
-            'ccy':ccy,
-            'txId':txId,
-            'state':state,
-            'after':after,
-            'before':before,
-            'limit':limit
-        }
-        return self._request_with_params(GET,SUBACCOUNT_DEPOSIT_HISTORY,params)
-
-    def get_rebate_daily(self,subAcct = '',begin = '',end = '',page = '',limit = ''):
-        params = {
-            'subAcct':subAcct,
-            'begin':begin,
-            'end':end,
-            'page':page,
-            'limit':limit
-        }
-        return self._request_with_params(GET,REBATE_DAILY,params)
-
-    def get_rebate_details_download_link(self,type ='',begin = '',end = ''):
-        params ={
-            'type':type,
-            'begin':begin,
-            'end':end
-        }
-        return self._request_with_params(GET,GET_REBATE_PER_ORDERS,params)
-
-
-
-    def generate_rebate_details_download_link(self,begin = '',end = ''):
-        params = {
-            'begin':begin,
-            'end':end
-        }
-        return self._request_with_params(POST,REBATE_PER_ORDERS,params)
-

python_okx-0.3.4.dist-info/RECORD

@@ -1,31 +0,0 @@
-okx/Account.py,sha256=zScfpbfld0iq65QtWI5yeeYhWAK3wFJlo_2pTZ9tJLo,13883
-okx/BlockTrading.py,sha256=LC44PIxd5-S2coHxCmYjG7WqAuwrMdfO644eui2Ixvc,4127
-okx/Convert.py,sha256=StJqUTODvycEtPyBmvl2Cao7ElzGWQW-95vREkvkhPo,1574
-okx/CopyTrading.py,sha256=6vrJFKqzRhRf5t279XsLNamdo06-L1ORjlX60nMwgw8,2750
-okx/Earning.py,sha256=_H7_a466naKaEt3-SD_ZUbi-swnm8VwYZ357xF4q2rM,3852
-okx/FDBroker.py,sha256=7nEWawZ3sVHRT-9beZ95KADtXf2eyNsL91Wchr7kLtQ,787
-okx/Funding.py,sha256=gjXqMMfbnexuYckDaspMRulAlG35aowliOj7NmxseUQ,6260
-okx/Grid.py,sha256=EYTZwf5-pWN75kdiukOfkEp20R2kttxj8d5HPNsdwWE,6690
-okx/MarketData.py,sha256=TsVXdH-wOUZQMQPG70BTIiaBhWG-dknwNbVJHjFgpFE,4927
-okx/NDBroker.py,sha256=u-PDdCePOEJowLCB5GyJXRQXsiTG1tWUznQX5qngkaQ,5062
-okx/PublicData.py,sha256=hNKowBqf4CEmB6-b0owKs4_nnGGVCQLOgaJb1YaimuI,5135
-okx/SimpleEarnFixed.py,sha256=ToT2bCDRJ3HPdvmGjPVEBy0B-ah0YhEdFknOycFGT7U,3434
-okx/SpreadTrading.py,sha256=V_TgEkGaD6Pce1VJmUB7fdiw16BzoUSdBeVxo7mfSmU,3226
-okx/Status.py,sha256=Nm2qRviE-40AVo_ndDtPludvObnWZ1OqP7qRZokTYuw,494
-okx/SubAccount.py,sha256=z8ZBVIHu4XW4bqTj97sifBiodgxbVgXOQ2Ndf2KycSo,3527
-okx/Trade.py,sha256=T1HQB9-Wo5MWlhrPahGub9hBXzQDe9QkkSShMpvyYIo,10838
-okx/TradingData.py,sha256=SMc5C3sQk5rwn08AsDDcbN6zQm_wy4S2JO0jQHAKVhU,2330
-okx/__init__.py,sha256=kTsebx0VGpzwNou5pyQXFzIDG-R383qlUQ_qH1lyLXQ,58
-okx/consts.py,sha256=h94U14Pw_wxSOe5Aej5hHYH4fYitCSi4a5p8c7_f2ew,15594
-okx/exceptions.py,sha256=ERuCnvnudJNBNACh3LNE3km5GJy0BGC5C3OKjgHXFaU,1182
-okx/okxclient.py,sha256=RepnkJnstxtNGyFmlPh_9b6SFUooxKk-fM7d6z0Dvvc,2598
-okx/utils.py,sha256=FTXSW73yXV6Hc4-9O22WFmkhayASYo7WQHIc_bTyc6g,1858
-okx/websocket/WebSocketFactory.py,sha256=PlcvdNjVoLEm2515E9p6zTXVvX1gLoebTyBoDPkMbwM,895
-okx/websocket/WsPrivateAsync.py,sha256=CYmZDRV16BxkrFhf7yeT7L4JyK2IZBlOIziaUOk3QCo,2282
-okx/websocket/WsPublicAsync.py,sha256=sOV-IUmgybOQI1snCoyPxD4hzIoiQLHjUVRWrS2_2cM,1561
-okx/websocket/WsUtils.py,sha256=ynkCtfvkrwBUiCi-_yqp1xTn3hhVd_o5ITIhD1xLdBo,2199
-okx/websocket/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_okx-0.3.4.dist-info/METADATA,sha256=XbN-TtjGohjydZ6nDdOMg8UfA8IVImGLUsLLbfcitfw,3145
-python_okx-0.3.4.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-python_okx-0.3.4.dist-info/top_level.txt,sha256=rrbhHZwiw4YlhG1LWWaAODvRxyZr3onxFnqwsHdikDc,4
-python_okx-0.3.4.dist-info/RECORD,,