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

okx/Account.py

@@ -27,13 +27,15 @@ class AccountAPI(OkxClient):
         params = {'instType': instType, 'instId': instId}
         return self._request_with_params(GET, POSITION_INFO, params)
 
-    def position_builder(self, inclRealPosAndEq=False, spotOffsetType=None, greeksType=None, simPos=None,
+    def position_builder(self, acctLv=None,inclRealPosAndEq=False, lever=None, greeksType=None, simPos=None,
                          simAsset=None):
         params = {}
+        if acctLv is not None:
+            params['acctLv'] = acctLv
         if inclRealPosAndEq is not None:
             params['inclRealPosAndEq'] = inclRealPosAndEq
-        if spotOffsetType is not None:
-            params['spotOffsetType'] = spotOffsetType
+        if lever is not None:
+            params['spotOffsetType'] = lever
         if greeksType is not None:
             params['greksType'] = greeksType
         if simPos is not None:

okx/Finance/FlexibleLoan.py

@@ -0,0 +1,65 @@
+from okx.okxclient import OkxClient
+from okx.consts import *
+
+
+class FlexibleLoanAPI(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 borrow_currencies(self):
+        return self._request_without_params(GET, FINANCE_BORROW_CURRENCIES)
+
+    def collateral_assets(self, ccy=''):
+        params = {}
+        if ccy != '':
+            params['ccy'] = ccy
+        return self._request_with_params(GET, FINANCE_COLLATERAL_ASSETS, params)
+
+    def max_loan(self, borrowCcy='', supCollateral=[]):
+        params = {
+            'borrowCcy': borrowCcy,
+            'supCollateral': supCollateral,
+        }
+        return self._request_with_params(POST, FINANCE_MAX_LOAN, params)
+
+    def max_collateral_redeem_amount(self, ccy=''):
+        params = {}
+        if ccy != '':
+            params['ccy'] = ccy
+        return self._request_with_params(GET, FINANCE_MAX_REDEEM, params)
+
+    def adjust_collateral(self, type='', collateralCcy='', collateralAmt=''):
+        params = {
+            'type': type,
+            'collateralCcy': collateralCcy,
+            'collateralAmt': collateralAmt,
+        }
+        return self._request_with_params(POST, FINANCE_ADJUST_COLLATERAL, params)
+
+    def loan_info(self):
+        return self._request_without_params(GET, FINANCE_LOAN_INFO)
+
+    def loan_history(self, type='', after='', before='', limit=''):
+        params = {}
+        if type != '':
+            params['type'] = type
+        if after != '':
+            params['after'] = after
+        if before != '':
+            params['before'] = before
+        if limit != '':
+            params['limit'] = limit
+        return self._request_with_params(GET, FINANCE_LOAN_HISTORY, params)
+
+    def interest_accrued(self, ccy='', after='', before='', limit=''):
+        params = {}
+        if ccy != '':
+            params['ccy'] = ccy
+        if after != '':
+            params['after'] = after
+        if before != '':
+            params['before'] = before
+        if limit != '':
+            params['limit'] = limit
+        return self._request_with_params(GET, FINANCE_INTEREST_ACCRUED, params)

okx/Funding.py

@@ -79,27 +79,6 @@ class FundingAPI(OkxClient):
         params = {'ccy':ccy, 'invoice':invoice, 'memo':memo}
         return self._request_with_params(POST, WITHDRAWAL_LIGHTNING, params)
 
-    # POST 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='', before='', after='', limit='' ):
-        params = {'ccy': ccy, 'after': after, 'before': before, 'limit': limit }
-        return self._request_with_params(GET, LENDING_HISTORY, params)
-
-    # GET LENDING RATE HISTORY
-    def get_lending_rate_history(self, ccy='',after = '',before = '',limit = '' ):
-        params = {'ccy': ccy,'after':after,'before':before,'limit':limit}
-        return self._request_with_params(GET, LENDING_RATE_HISTORY, params)
-
-    # GET LENDING RATE SUMMARY
-    def get_lending_rate_summary(self, ccy=''):
-        params = {'ccy': ccy}
-        return self._request_with_params(GET, LENDING_RATE_SUMMARY, params)
-
-
     #POST /api/v5/asset/cancel-withdrawal
     def cancel_withdrawal(self,wdId = ''):
         params = {
@@ -121,13 +100,6 @@ class FundingAPI(OkxClient):
         }
         return self._request_with_params(GET, ASSET_VALUATION, params)
 
-    #GET / api / v5 / asset / saving - balance
-    def get_saving_balance(self,ccy = ''):
-        params = {
-            'ccy':ccy
-        }
-        return self._request_with_params(GET, GET_SAVING_BALANCE, params)
-
     #Get non-tradable assets
     def get_non_tradable_assets(self, ccy=''):
         params = {

okx/MarketData.py

@@ -60,10 +60,6 @@ class MarketAPI(OkxClient):
     def get_volume(self):
         return self._request_without_params(GET, VOLUMNE)
 
-    # Get Oracle
-    def get_oracle(self):
-        return self._request_without_params(GET, ORACLE)
-
     # Get Tier
     def get_tier(self, instType='', tdMode='', uly='', instId='', ccy='', tier=''):
         params = {'instType': instType, 'tdMode': tdMode, 'uly': uly, 'instId': instId, 'ccy': ccy, 'tier': tier}

okx/Trade.py

@@ -12,14 +12,10 @@ class TradeAPI(OkxClient):
 
     # Place Order
     def place_order(self, instId, tdMode, side, ordType, sz, ccy='', clOrdId='', tag='', posSide='', px='',
-                    reduceOnly='', tgtCcy='', tpTriggerPx='', tpOrdPx='', slTriggerPx='', slOrdPx='',
-                    tpTriggerPxType='', slTriggerPxType='', quickMgnType='', stpId='', stpMode='',
-                    attachAlgoOrds=None):
+                    reduceOnly='', tgtCcy='', stpMode='', attachAlgoOrds=None, pxUsd='', pxVol='', banAmend=''):
         params = {'instId': instId, 'tdMode': tdMode, 'side': side, 'ordType': ordType, 'sz': sz, 'ccy': ccy,
                   'clOrdId': clOrdId, 'tag': tag, 'posSide': posSide, 'px': px, 'reduceOnly': reduceOnly,
-                  'tgtCcy': tgtCcy, 'tpTriggerPx': tpTriggerPx, 'tpOrdPx': tpOrdPx, 'slTriggerPx': slTriggerPx,
-                  'slOrdPx': slOrdPx, 'tpTriggerPxType': tpTriggerPxType, 'slTriggerPxType': slTriggerPxType,
-                  'quickMgnType': quickMgnType, 'stpId': stpId, 'stpMode': stpMode}
+                  'tgtCcy': tgtCcy, 'stpMode': stpMode, 'pxUsd': pxUsd, 'pxVol': pxVol, 'banAmend': banAmend}
         params['attachAlgoOrds'] = attachAlgoOrds
         return self._request_with_params(POST, PLACR_ORDER, params)
 
@@ -115,10 +111,6 @@ class TradeAPI(OkxClient):
     def cancel_algo_order(self, params):
         return self._request_with_params(POST, CANCEL_ALGOS, params)
 
-    # Cancel Advance Algos
-    def cancel_advance_algos(self, params):
-        return self._request_with_params(POST, Cancel_Advance_Algos, params)
-
     # Get Algo Order List
     def order_algos_list(self, ordType='', algoId='', instType='', instId='', after='', before='', limit='',
                          algoClOrdId=''):
@@ -191,3 +183,21 @@ class TradeAPI(OkxClient):
                   'newSlTriggerPx': newSlTriggerPx, 'newSlOrdPx': newSlOrdPx,
                   'newTpTriggerPxType': newTpTriggerPxType, 'newSlTriggerPxType': newSlTriggerPxType}
         return self._request_with_params(POST, AMEND_ALGO_ORDER, params)
+
+    def get_oneclick_repay_list_v2(self):
+        return self._request_without_params(GET, ONE_CLICK_REPAY_SUPPORT_V2)
+
+    def oneclick_repay_v2(self, debtCcy='', repayCcyList=[]):
+        params = {
+            'debtCcy': debtCcy,
+            'repayCcyList': repayCcyList
+        }
+        return self._request_with_params(POST, ONE_CLICK_REPAY_V2, params)
+
+    def oneclick_repay_history_v2(self, after='', before='', limit=''):
+        params = {
+            'after': after,
+            'before': before,
+            'limit': limit
+        }
+        return self._request_with_params(GET, ONE_CLICK_REPAY_HISTORY_V2, params)

okx/__init__.py

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

okx/consts.py

@@ -1,4 +1,4 @@
-# http header
+# Http header
 API_URL = 'https://www.okx.com'
 
 CONTENT_TYPE = 'Content-Type'
@@ -18,7 +18,7 @@ POST = "POST"
 
 SERVER_TIMESTAMP_URL = '/api/v5/public/time'
 
-# account-complete-testcomplete
+# Account
 POSITION_RISK='/api/v5/account/account-position-risk'
 ACCOUNT_INFO = '/api/v5/account/balance'
 POSITION_INFO = '/api/v5/account/positions'
@@ -44,8 +44,8 @@ BORROW_REPAY_HISTORY = '/api/v5/account/borrow-repay-history'
 INTEREST_LIMITS = '/api/v5/account/interest-limits'
 SIMULATED_MARGIN = '/api/v5/account/simulated_margin'
 GREEKS = '/api/v5/account/greeks'
-POSITIONS_HISTORY = '/api/v5/account/positions-history' #need add
-GET_PM_LIMIT = '/api/v5/account/position-tiers' #need add
+POSITIONS_HISTORY = '/api/v5/account/positions-history'
+GET_PM_LIMIT = '/api/v5/account/position-tiers'
 GET_VIP_INTEREST_ACCRUED_DATA = '/api/v5/account/vip-interest-accrued'
 GET_VIP_INTEREST_DEDUCTED_DATA = '/api/v5/account/vip-interest-deducted'
 GET_VIP_LOAN_ORDER_LIST= '/api/v5/account/vip-loan-order-list'
@@ -67,7 +67,7 @@ MANUAL_REBORROW_REPAY = '/api/v5/account/spot-manual-borrow-repay'
 SET_AUTO_REPAY='/api/v5/account/set-auto-repay'
 GET_BORROW_REPAY_HISTORY='/api/v5/account/spot-borrow-repay-history'
 
-# funding-complete-testcomplete
+# Funding
 NON_TRADABLE_ASSETS = '/api/v5/asset/non-tradable-assets'
 DEPOSIT_ADDRESS = '/api/v5/asset/deposit-address'
 GET_BALANCES = '/api/v5/asset/balances'
@@ -80,21 +80,16 @@ PURCHASE_REDEMPT = '/api/v5/asset/purchase_redempt'
 BILLS_INFO = '/api/v5/asset/bills'
 DEPOSIT_LIGHTNING = '/api/v5/asset/deposit-lightning'
 WITHDRAWAL_LIGHTNING = '/api/v5/asset/withdrawal-lightning'
-CANCEL_WITHDRAWAL = '/api/v5/asset/cancel-withdrawal' #need add
+CANCEL_WITHDRAWAL = '/api/v5/asset/cancel-withdrawal'
 WITHDRAWAL_HISTORY = '/api/v5/asset/withdrawal-history'
-CONVERT_DUST_ASSETS = '/api/v5/asset/convert-dust-assets' #need add
-ASSET_VALUATION = '/api/v5/asset/asset-valuation' #need add
-SET_LENDING_RATE = '/api/v5/asset/set-lending-rate'
-LENDING_HISTORY = '/api/v5/asset/lending-history'
-LENDING_RATE_HISTORY = '/api/v5/asset/lending-rate-history'
-LENDING_RATE_SUMMARY = '/api/v5/asset/lending-rate-summary'
-GET_SAVING_BALANCE = '/api/v5/asset/saving-balance' #need to add
+CONVERT_DUST_ASSETS = '/api/v5/asset/convert-dust-assets'
+ASSET_VALUATION = '/api/v5/asset/asset-valuation'
 GET_WITHDRAWAL_HISTORY = '/api/v5/asset/withdrawal-history'
 GET_NON_TRADABLE_ASSETS = '/api/v5/asset/non-tradable-assets'
 GET_DEPOSIT_WITHDrAW_STATUS = '/api/v5/asset/deposit-withdraw-status'
 
 
-# Market Data-Complete-testComplete
+# Market Data
 TICKERS_INFO = '/api/v5/market/tickers'
 TICKER_INFO = '/api/v5/market/ticker'
 INDEX_TICKERS = '/api/v5/market/index-tickers'
@@ -105,17 +100,16 @@ INDEX_CANSLES = '/api/v5/market/index-candles'
 MARKPRICE_CANDLES = '/api/v5/market/mark-price-candles'
 MARKET_TRADES = '/api/v5/market/trades'
 VOLUMNE = '/api/v5/market/platform-24-volume'
-ORACLE = '/api/v5/market/open-oracle' #need to update? if it is open oracle
-INDEX_COMPONENTS = '/api/v5/market/index-components' #need to add
-EXCHANGE_RATE = '/api/v5/market/exchange-rate' #need to add
-HISTORY_TRADES = '/api/v5/market/history-trades' #need to add
-BLOCK_TICKERS = '/api/v5/market/block-tickers' #need to add
-BLOCK_TICKER = '/api/v5/market/block-ticker'#need to add
-BLOCK_TRADES = '/api/v5/market/block-trades'#need to add
+INDEX_COMPONENTS = '/api/v5/market/index-components'
+EXCHANGE_RATE = '/api/v5/market/exchange-rate'
+HISTORY_TRADES = '/api/v5/market/history-trades'
+BLOCK_TICKERS = '/api/v5/market/block-tickers'
+BLOCK_TICKER = '/api/v5/market/block-ticker'
+BLOCK_TRADES = '/api/v5/market/block-trades'
 GET_ORDER_LITE_BOOK = '/api/v5/market/books-lite'
 GET_OPTION_TRADES = '/api/v5/market/option/instrument-family-trades'
 
-# Public Data-Complete-testComplete
+# Public Data
 INSTRUMENT_INFO = '/api/v5/public/instruments'
 DELIVERY_EXERCISE = '/api/v5/public/delivery-exercise-history'
 OPEN_INTEREST = '/api/v5/public/open-interest'
@@ -129,15 +123,15 @@ SYSTEM_TIME = '/api/v5/public/time'
 LIQUIDATION_ORDERS = '/api/v5/public/liquidation-orders'
 MARK_PRICE = '/api/v5/public/mark-price'
 TIER = '/api/v5/public/position-tiers'
-INTEREST_LOAN = '/api/v5/public/interest-rate-loan-quota' #need to add
-UNDERLYING = '/api/v5/public/underlying' #need to add
-VIP_INTEREST_RATE_LOAN_QUOTA = '/api/v5/public/vip-interest-rate-loan-quota' #need to add
-INSURANCE_FUND = '/api/v5/public/insurance-fund'#need to add
-CONVERT_CONTRACT_COIN = '/api/v5/public/convert-contract-coin' #need to add
+INTEREST_LOAN = '/api/v5/public/interest-rate-loan-quota'
+UNDERLYING = '/api/v5/public/underlying'
+VIP_INTEREST_RATE_LOAN_QUOTA = '/api/v5/public/vip-interest-rate-loan-quota'
+INSURANCE_FUND = '/api/v5/public/insurance-fund'
+CONVERT_CONTRACT_COIN = '/api/v5/public/convert-contract-coin'
 GET_OPTION_TICKBANDS = '/api/v5/public/instrument-tick-bands'
 GET_OPTION_TRADES = '/api/v5/public/option-trades'
 
-# TRADING DATA-COMPLETE
+# Trading data
 SUPPORT_COIN = '/api/v5/rubik/stat/trading-data/support-coin'
 TAKER_VOLUME = '/api/v5/rubik/stat/taker-volume'
 MARGIN_LENDING_RATIO = '/api/v5/rubik/stat/margin/loan-ratio'
@@ -149,7 +143,7 @@ OPEN_INTEREST_VOLUME_EXPIRY = '/api/v5/rubik/stat/option/open-interest-volume-ex
 INTEREST_VOLUME_STRIKE = '/api/v5/rubik/stat/option/open-interest-volume-strike'
 TAKER_FLOW = '/api/v5/rubik/stat/option/taker-block-volume'
 
-# TRADE-Complete
+# Trade
 PLACR_ORDER = '/api/v5/trade/order'
 BATCH_ORDERS = '/api/v5/trade/batch-orders'
 CANCEL_ORDER = '/api/v5/trade/cancel-order'
@@ -165,45 +159,46 @@ ORDER_FILLS = '/api/v5/trade/fills'
 ORDERS_FILLS_HISTORY = '/api/v5/trade/fills-history'
 PLACE_ALGO_ORDER = '/api/v5/trade/order-algo'
 CANCEL_ALGOS = '/api/v5/trade/cancel-algos'
-Cancel_Advance_Algos = '/api/v5/trade/cancel-advance-algos'
 ORDERS_ALGO_PENDING = '/api/v5/trade/orders-algo-pending'
 ORDERS_ALGO_HISTORY = '/api/v5/trade/orders-algo-history'
 GET_ALGO_ORDER_DETAILS = '/api/v5/trade/order-algo'
 AMEND_ALGO_ORDER = '/api/v5/trade/amend-algos'
-
 EASY_CONVERT_CURRENCY_LIST = '/api/v5/trade/easy-convert-currency-list'
 EASY_CONVERT = '/api/v5/trade/easy-convert'
 CONVERT_EASY_HISTORY = '/api/v5/trade/easy-convert-history'
 ONE_CLICK_REPAY_SUPPORT = '/api/v5/trade/one-click-repay-currency-list'
 ONE_CLICK_REPAY = '/api/v5/trade/one-click-repay'
 ONE_CLICK_REPAY_HISTORY = '/api/v5/trade/one-click-repay-history'
+ONE_CLICK_REPAY_SUPPORT_V2 = '/api/v5/trade/one-click-repay-currency-list-v2'
+ONE_CLICK_REPAY_V2 = '/api/v5/trade/one-click-repay-v2'
+ONE_CLICK_REPAY_HISTORY_V2 = '/api/v5/trade/one-click-repay-history-v2'
 
 
-# SubAccount-complete-testwriteComplete
+# SubAccount
 BALANCE = '/api/v5/account/subaccount/balances'
 BILLs = '/api/v5/asset/subaccount/bills'
 RESET = '/api/v5/users/subaccount/modify-apikey'
 VIEW_LIST = '/api/v5/users/subaccount/list'
 SUBACCOUNT_TRANSFER = '/api/v5/asset/subaccount/transfer'
-ENTRUST_SUBACCOUNT_LIST = '/api/v5/users/entrust-subaccount-list' #need to add
-SET_TRSNSFER_OUT = '/api/v5/users/subaccount/set-transfer-out' #need to add
-GET_ASSET_SUBACCOUNT_BALANCE = '/api/v5/asset/subaccount/balances' #need to add
+ENTRUST_SUBACCOUNT_LIST = '/api/v5/users/entrust-subaccount-list'
+SET_TRSNSFER_OUT = '/api/v5/users/subaccount/set-transfer-out'
+GET_ASSET_SUBACCOUNT_BALANCE = '/api/v5/asset/subaccount/balances'
 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'
 
-# Convert-Complete
+# Convert
 GET_CURRENCIES = '/api/v5/asset/convert/currencies'
 GET_CURRENCY_PAIR = '/api/v5/asset/convert/currency-pair'
 ESTIMATE_QUOTE = '/api/v5/asset/convert/estimate-quote'
 CONVERT_TRADE = '/api/v5/asset/convert/trade'
 CONVERT_HISTORY = '/api/v5/asset/convert/history'
 
-# FDBroker -completed
+# FD Broker
 FD_GET_REBATE_PER_ORDERS = '/api/v5/broker/fd/rebate-per-orders'
 FD_REBATE_PER_ORDERS = '/api/v5/broker/fd/rebate-per-orders'
 
-# Rfq/BlcokTrading-completed
+# BlockTrading
 COUNTERPARTIES = '/api/v5/rfq/counterparties'
 CREATE_RFQ = '/api/v5/rfq/create-rfq'
 CANCEL_RFQ = '/api/v5/rfq/cancel-rfq'
@@ -222,7 +217,7 @@ MMP_RESET = '/api/v5/rfq/mmp-reset'
 MARKER_INSTRUMENT_SETTING = '/api/v5/rfq/maker-instrument-settings'
 
 
-# tradingBot-Grid-complete-testcomplete
+# Trading Bot
 GRID_ORDER_ALGO = '/api/v5/tradingBot/grid/order-algo'
 GRID_AMEND_ORDER_ALGO = '/api/v5/tradingBot/grid/amend-order-algo'
 GRID_STOP_ORDER_ALGO = '/api/v5/tradingBot/grid/stop-order-algo'
@@ -232,7 +227,6 @@ GRID_ORDERS_ALGO_DETAILS = '/api/v5/tradingBot/grid/orders-algo-details'
 GRID_SUB_ORDERS = '/api/v5/tradingBot/grid/sub-orders'
 GRID_POSITIONS = '/api/v5/tradingBot/grid/positions'
 GRID_WITHDRAW_INCOME = '/api/v5/tradingBot/grid/withdraw-income'
-#--------need to add:
 GRID_COMPUTE_MARIGIN_BALANCE = '/api/v5/tradingBot/grid/compute-margin-balance'
 GRID_MARGIN_BALANCE = '/api/v5/tradingBot/grid/margin-balance'
 GRID_AI_PARAM = '/api/v5/tradingBot/grid/ai-param'
@@ -244,7 +238,7 @@ GET_RECURRING_BUY_ORDER_HISTORY = '/api/v5/tradingBot/recurring/orders-algo-hist
 GET_RECURRING_BUY_ORDER_DETAILS = '/api/v5/tradingBot/recurring/orders-algo-details'
 GET_RECURRING_BUY_SUB_ORDERS = '/api/v5/tradingBot/recurring/sub-orders'
 
-#stacking - all need to implement-testcomplete
+# Stacking
 STACK_DEFI_OFFERS = '/api/v5/finance/staking-defi/offers'
 STACK_DEFI_PURCHASE = '/api/v5/finance/staking-defi/purchase'
 STACK_DEFI_REDEEM = '/api/v5/finance/staking-defi/redeem'
@@ -269,10 +263,10 @@ 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
 STATUS = '/api/v5/system/status'
 
-#Copy Trading
+# Copy Trading
 GET_EXISTING_LEADING_POSITIONS = '/api/v5/copytrading/current-subpositions'
 GET_LEADING_POSITIONS_HISTORY = '/api/v5/copytrading/subpositions-history'
 PLACE_LEADING_STOP_ORDER = '/api/v5/copytrading/algo-order'
@@ -296,13 +290,14 @@ SPREAD_GET_ORDER_BOOK = '/api/v5/sprd/books'
 SPREAD_GET_TICKER = '/api/v5/sprd/ticker'
 SPREAD_GET_PUBLIC_TRADES = '/api/v5/sprd/public-trades'
 
-# Simple earn fixed
-LENDING_OFFERS = '/api/v5/finance/fixed-loan/lending-offers'
-LENDING_APY_HISTORY='/api/v5/finance/fixed-loan/lending-apy-history'
-PENDING_LENDING_VOLUME = '/api/v5/finance/fixed-loan/pending-lending-volume'
-PLACE_LENDING_ORDER= '/api/v5/finance/fixed-loan/lending-order'
-AMEND_LENDING_ORDER='/api/v5/finance/fixed-loan/amend-lending-order'
-LENDING_ORDERS_LIST='/api/v5/finance/fixed-loan/lending-orders-list'
-LENDING_SUB_ORDERS='/api/v5/finance/fixed-loan/lending-sub-orders'
+# Flexible loan
+FINANCE_BORROW_CURRENCIES = '/api/v5/finance/flexible-loan/borrow-currencies'
+FINANCE_COLLATERAL_ASSETS = '/api/v5/finance/flexible-loan/collateral-assets'
+FINANCE_MAX_LOAN = '/api/v5/finance/flexible-loan/max-loan'
+FINANCE_MAX_REDEEM = '/api/v5/finance/flexible-loan/max-collateral-redeem-amount'
+FINANCE_ADJUST_COLLATERAL = '/api/v5/finance/flexible-loan/adjust-collateral'
+FINANCE_LOAN_INFO = '/api/v5/finance/flexible-loan/loan-info'
+FINANCE_LOAN_HISTORY = '/api/v5/finance/flexible-loan/loan-history'
+FINANCE_INTEREST_ACCRUED = '/api/v5/finance/flexible-loan/interest-accrued'
 
 

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

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

{python_okx-0.3.6.dist-info → python_okx-0.3.8.dist-info}/RECORD

@@ -1,24 +1,24 @@
-okx/Account.py,sha256=7hMU6Bt-5ogC-FUGAyiPDLsvQQsB8Tvm7K8AZdnSzaE,14080
+okx/Account.py,sha256=GK31nIOcVfjskr1QT4FM3b3dMuPp8NbKkQViHtJ0ekI,14134
 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/Funding.py,sha256=JN6A7-uUJ83Y-AtqmBr7JUVHOa0lJtABQTS_lQ-6H7g,5173
 okx/Grid.py,sha256=r8cZidY2okqrb-zpyTsFJrecPzw2s25ySH3tOBDnDtA,6691
-okx/MarketData.py,sha256=n9AgxmFyr4GoDQjxkKdryInDhnYfGcxeBrWZSMHu8kI,4928
+okx/MarketData.py,sha256=4GO8Vdkh02GQFJeqC0k4ej3w49wkZroEOoVJ407_ju4,4827
 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/Trade.py,sha256=j7iSIXGTxuIN7mBO1I7_lki7B8ThuEyLSf3oSuMuUIo,11075
 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/__init__.py,sha256=jZ3qlMIccCOCV6wEanDQBTzQjm9efjrelxSeFzhXDKE,58
+okx/consts.py,sha256=N0KSKnyzZa3Wv8jpbq_SsdxspkbAB11yXQLHlaumKh4,14698
 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/FlexibleLoan.py,sha256=L-j1O73fEIIiM_h8NvCT6NocUv6KAx2WEQU6F9GRzIw,2351
 okx/Finance/Savings.py,sha256=qZbv-KzgGt_me8RZePDSUiRCI1mbz692EK2ZhfYiH8c,1999
 okx/Finance/SolStaking.py,sha256=XuGFFonpRpMQkrhNlpyOb644EApb3joQ74PRabN0PTs,1502
 okx/Finance/StakingDefi.py,sha256=eWyAAmMDht4B4N5VWf3bj3FxSBETMXaay-Luu4GN3ls,2250
@@ -28,7 +28,7 @@ okx/websocket/WsPrivateAsync.py,sha256=zmZuInowW9_YWpQoZoicbbff-UwWvWxOluKclomNc
 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,,
+python_okx-0.3.8.dist-info/METADATA,sha256=lIRvleY4tKE0CUH8nfQp4DLOD6X8YPE3ux8QL782-Jg,3145
+python_okx-0.3.8.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+python_okx-0.3.8.dist-info/top_level.txt,sha256=rrbhHZwiw4YlhG1LWWaAODvRxyZr3onxFnqwsHdikDc,4
+python_okx-0.3.8.dist-info/RECORD,,

okx/SimpleEarnFixed.py

@@ -1,91 +0,0 @@
-from okx.consts import GET, LENDING_OFFERS, LENDING_APY_HISTORY, PENDING_LENDING_VOLUME, PLACE_LENDING_ORDER, POST, \
-    AMEND_LENDING_ORDER, LENDING_ORDERS_LIST, LENDING_SUB_ORDERS
-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=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):
-        params = {}
-        if ccy is not None:
-            params['ccy'] = ccy
-        if term is not None:
-            params['term'] = term
-        return self._request_with_params(GET, LENDING_OFFERS, params)
-
-    def get_lending_apy_history(self, ccy=None, term=None):
-        params = {}
-        if ccy is not None:
-            params['ccy'] = ccy
-        if term is not None:
-            params['term'] = term
-        return self._request_with_params(GET, LENDING_APY_HISTORY, params)
-
-    def get_pending_lending_volume(self, ccy=None, term=None):
-        params = {}
-        if ccy is not None:
-            params['ccy'] = ccy
-        if term is not None:
-            params['term'] = term
-        return self._request_with_params(GET, PENDING_LENDING_VOLUME, params)
-
-    def place_lending_order(self, ccy=None, amt=None, rate=None, term=None, autoRenewal=False):
-        params = {}
-        if ccy is not None:
-            params['ccy'] = ccy
-        if amt is not None:
-            params['amt'] = amt
-        if rate is not None:
-            params['rate'] = rate
-        if term is not None:
-            params['term'] = term
-        if autoRenewal:
-            params['autoRenewal'] = autoRenewal
-        return self._request_with_params(POST, PLACE_LENDING_ORDER, params)
-    def amend_lending_order(self, ordId=None, changeAmt=None, rate=None,autoRenewal=False):
-        params = {}
-        if ordId is not None:
-            params['ordId'] = ordId
-        if changeAmt is not None:
-            params['amt'] = changeAmt
-        if rate is not None:
-            params['rate'] = rate
-        params['autoRenewal'] = autoRenewal
-        return self._request_with_params(POST, AMEND_LENDING_ORDER, params)
-
-    def get_lending_orders_list(self, ordId = None,ccy=None, state=None, after=None,before=None,limit=None):
-        params = {}
-        if ordId is not None:
-            params['ordId'] = ordId
-        if ccy is not None:
-            params['ccy'] = ccy
-        if state is not None:
-            params['state'] = state
-        if after is not None:
-            params['after'] = after
-        if before is not None:
-            params['before'] = before
-        if limit:
-            params['limit'] = limit
-        return self._request_with_params(GET, LENDING_ORDERS_LIST, params)
-
-    def get_lending_sub_orders(self, ordId = None, state=None, after=None,before=None,limit=None):
-        params = {}
-        if ordId is not None:
-            params['ordId'] = ordId
-        if state is not None:
-            params['state'] = state
-        if after is not None:
-            params['after'] = after
-        if before is not None:
-            params['before'] = before
-        if limit:
-            params['limit'] = limit
-        return self._request_with_params(GET, LENDING_SUB_ORDERS, params)
-
-
-
-