ccxt-ir 4.3.46.0.3__py2.py3-none-any.whl → 4.5.0__py2.py3-none-any.whl

ccxt/async_support/upbit.py

@@ -5,7 +5,7 @@
 
 from ccxt.async_support.base.exchange import Exchange
 from ccxt.abstract.upbit import ImplicitAPI
-from ccxt.base.types import Balances, Currency, Int, Market, Num, Order, OrderBook, OrderSide, OrderType, Str, Strings, Ticker, Tickers, Trade, TradingFeeInterface, Transaction
+from ccxt.base.types import Any, Balances, Currency, DepositAddress, Int, Market, Num, Order, OrderBook, OrderSide, OrderType, Str, Strings, Ticker, Tickers, OrderBooks, Trade, TradingFeeInterface, TradingFees, Transaction
 from typing import List
 from ccxt.base.errors import ExchangeError
 from ccxt.base.errors import AuthenticationError
@@ -22,13 +22,13 @@ from ccxt.base.precise import Precise
 
 class upbit(Exchange, ImplicitAPI):
 
-    def describe(self):
+    def describe(self) -> Any:
         return self.deep_extend(super(upbit, self).describe(), {
             'id': 'upbit',
             'name': 'Upbit',
             'countries': ['KR'],
             'version': 'v1',
-            'rateLimit': 1000,
+            'rateLimit': 50,
             'pro': True,
             # new metainfo interface
             'has': {
@@ -45,12 +45,14 @@ class upbit(Exchange, ImplicitAPI):
                 'createMarketOrderWithCost': False,
                 'createMarketSellOrderWithCost': False,
                 'createOrder': True,
+                'editOrder': True,
                 'fetchBalance': True,
                 'fetchCanceledOrders': True,
                 'fetchClosedOrders': True,
                 'fetchDeposit': True,
                 'fetchDepositAddress': True,
                 'fetchDepositAddresses': True,
+                'fetchDepositAddressesByNetwork': False,
                 'fetchDeposits': True,
                 'fetchFundingHistory': False,
                 'fetchFundingRate': False,
@@ -74,7 +76,7 @@ class upbit(Exchange, ImplicitAPI):
                 'fetchTickers': True,
                 'fetchTrades': True,
                 'fetchTradingFee': True,
-                'fetchTradingFees': False,
+                'fetchTradingFees': True,
                 'fetchTransactions': False,
                 'fetchWithdrawal': True,
                 'fetchWithdrawals': True,
@@ -82,6 +84,7 @@ class upbit(Exchange, ImplicitAPI):
                 'withdraw': True,
             },
             'timeframes': {
+                '1s': 'seconds',
                 '1m': 'minutes',
                 '3m': 'minutes',
                 '5m': 'minutes',
@@ -93,6 +96,7 @@ class upbit(Exchange, ImplicitAPI):
                 '1d': 'days',
                 '1w': 'weeks',
                 '1M': 'months',
+                '1y': 'years',
             },
             'hostname': 'api.upbit.com',
             'urls': {
@@ -106,51 +110,70 @@ class upbit(Exchange, ImplicitAPI):
                 'fees': 'https://upbit.com/service_center/guide',
             },
             'api': {
+                # 'endpoint','API Cost'
+                # cost = 1000 / (rateLimit * RPS)
                 'public': {
-                    'get': [
-                        'market/all',
-                        'candles/{timeframe}',
-                        'candles/{timeframe}/{unit}',
-                        'candles/minutes/{unit}',
-                        'candles/minutes/1',
-                        'candles/minutes/3',
-                        'candles/minutes/5',
-                        'candles/minutes/10',
-                        'candles/minutes/15',
-                        'candles/minutes/30',
-                        'candles/minutes/60',
-                        'candles/minutes/240',
-                        'candles/days',
-                        'candles/weeks',
-                        'candles/months',
-                        'trades/ticks',
-                        'ticker',
-                        'orderbook',
-                    ],
+                    'get': {
+                        'market/all': 2,  # RPS: 10
+                        'candles/{timeframe}': 2,
+                        'candles/{timeframe}/{unit}': 2,
+                        'candles/seconds': 2,
+                        'candles/minutes/{unit}': 2,
+                        'candles/minutes/1': 2,
+                        'candles/minutes/3': 2,
+                        'candles/minutes/5': 2,
+                        'candles/minutes/10': 2,
+                        'candles/minutes/15': 2,
+                        'candles/minutes/30': 2,
+                        'candles/minutes/60': 2,
+                        'candles/minutes/240': 2,
+                        'candles/days': 2,
+                        'candles/weeks': 2,
+                        'candles/months': 2,
+                        'candles/years': 2,
+                        'trades/ticks': 2,
+                        'ticker': 2,
+                        'ticker/all': 2,
+                        'orderbook': 2,
+                        'orderbook/supported_levels': 2,  # Upbit KR only
+                    },
                 },
                 'private': {
-                    'get': [
-                        'accounts',
-                        'orders/chance',
-                        'order',
-                        'orders',
-                        'withdraws',
-                        'withdraw',
-                        'withdraws/chance',
-                        'deposits',
-                        'deposit',
-                        'deposits/coin_addresses',
-                        'deposits/coin_address',
-                    ],
-                    'post': [
-                        'orders',
-                        'withdraws/coin',
-                        'withdraws/krw',
-                        'deposits/generate_coin_address',
-                    ],
-                    'delete': [
-                        'order',
-                    ],
+                    'get': {
+                        'accounts': 0.67,  # RPS: 30
+                        'orders/chance': 0.67,
+                        'order': 0.67,
+                        'orders/closed': 0.67,
+                        'orders/open': 0.67,
+                        'orders/uuids': 0.67,
+                        'withdraws': 0.67,
+                        'withdraw': 0.67,
+                        'withdraws/chance': 0.67,
+                        'withdraws/coin_addresses': 0.67,
+                        'deposits': 0.67,
+                        'deposits/chance/coin': 0.67,
+                        'deposit': 0.67,
+                        'deposits/coin_addresses': 0.67,
+                        'deposits/coin_address': 0.67,
+                        'travel_rule/vasps': 0.67,
+                        'status/wallet': 0.67,  # Upbit KR only
+                        'api_keys': 0.67,  # Upbit KR only
+                    },
+                    'post': {
+                        'orders': 2.5,  # RPS: 8
+                        'orders/cancel_and_new': 2.5,  # RPS: 8
+                        'withdraws/coin': 0.67,
+                        'withdraws/krw': 0.67,  # Upbit KR only.
+                        'deposits/krw': 0.67,  # Upbit KR only.
+                        'deposits/generate_coin_address': 0.67,
+                        'travel_rule/deposit/uuid': 0.67,  # RPS: 30, but each deposit can only be queried once every 10 minutes
+                        'travel_rule/deposit/txid': 0.67,  # RPS: 30, but each deposit can only be queried once every 10 minutes
+                    },
+                    'delete': {
+                        'order': 0.67,
+                        'orders/open': 40,  # RPS: 0.5
+                        'orders/uuids': 0.67,
+                    },
                 },
             },
             'fees': {
@@ -167,6 +190,70 @@ class upbit(Exchange, ImplicitAPI):
                     'deposit': {},
                 },
             },
+            'features': {
+                'spot': {
+                    'sandbox': False,
+                    'createOrder': {
+                        'marginMode': False,
+                        'triggerPrice': False,
+                        'triggerPriceType': None,
+                        'triggerDirection': False,
+                        'stopLossPrice': False,
+                        'takeProfitPrice': False,
+                        'attachedStopLossTakeProfit': None,
+                        'timeInForce': {
+                            'IOC': True,
+                            'FOK': True,
+                            'PO': False,
+                            'GTD': False,
+                        },
+                        'hedged': False,
+                        'leverage': False,
+                        'marketBuyByCost': False,
+                        'marketBuyRequiresPrice': False,
+                        'selfTradePrevention': False,
+                        'trailing': False,
+                        'iceberg': False,
+                    },
+                    'createOrders': None,
+                    'fetchMyTrades': None,
+                    'fetchOrder': {
+                        'marginMode': False,
+                        'trigger': False,
+                        'trailing': False,
+                        'symbolRequired': False,
+                    },
+                    'fetchOpenOrders': {
+                        'marginMode': True,
+                        'limit': 100,
+                        'trigger': False,
+                        'trailing': False,
+                        'symbolRequired': False,
+                    },
+                    'fetchOrders': None,  # todo
+                    'fetchClosedOrders': {
+                        'marginMode': False,
+                        'limit': 1000,
+                        'daysBack': 100000,
+                        'daysBackCanceled': 1,
+                        'untilDays': 7,
+                        'trigger': False,
+                        'trailing': False,
+                        'symbolRequired': False,
+                    },
+                    'fetchOHLCV': {
+                        'limit': 200,
+                    },
+                },
+                'swap': {
+                    'linear': None,
+                    'inverse': None,
+                },
+                'future': {
+                    'linear': None,
+                    'inverse': None,
+                },
+            },
             'precisionMode': TICK_SIZE,
             'exceptions': {
                 'exact': {
@@ -189,8 +276,6 @@ class upbit(Exchange, ImplicitAPI):
             },
             'options': {
                 'createMarketBuyOrderRequiresPrice': True,
-                'fetchTickersMaxLength': 4096,  # 2048,
-                'fetchOrderBooksMaxLength': 4096,  # 2048,
                 'tradingFeesByQuoteCurrency': {
                     'KRW': 0.0005,
                 },
@@ -405,7 +490,10 @@ class upbit(Exchange, ImplicitAPI):
 
     async def fetch_markets(self, params={}) -> List[Market]:
         """
-        :see: https://docs.upbit.com/reference/%EB%A7%88%EC%BC%93-%EC%BD%94%EB%93%9C-%EC%A1%B0%ED%9A%8C
+
+        https://docs.upbit.com/kr/reference/마켓-코드-조회
+        https://global-docs.upbit.com/reference/listing-market-list
+
         retrieves data on all markets for upbit
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict[]: an array of objects representing market data
@@ -498,7 +586,10 @@ class upbit(Exchange, ImplicitAPI):
 
     async def fetch_balance(self, params={}) -> Balances:
         """
-        :see: https://docs.upbit.com/reference/%EC%A0%84%EC%B2%B4-%EA%B3%84%EC%A2%8C-%EC%A1%B0%ED%9A%8C
+
+        https://docs.upbit.com/kr/reference/전체-계좌-조회
+        https://global-docs.upbit.com/reference/overall-account-inquiry
+
         query for balance and get the amount of funds available for trading or funds locked in orders
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
@@ -519,9 +610,12 @@ class upbit(Exchange, ImplicitAPI):
         #
         return self.parse_balance(response)
 
-    async def fetch_order_books(self, symbols: Strings = None, limit: Int = None, params={}):
+    async def fetch_order_books(self, symbols: Strings = None, limit: Int = None, params={}) -> OrderBooks:
         """
-        :see: https://docs.upbit.com/reference/%ED%98%B8%EA%B0%80-%EC%A0%95%EB%B3%B4-%EC%A1%B0%ED%9A%8C
+
+        https://docs.upbit.com/kr/reference/호가-정보-조회
+        https://global-docs.upbit.com/reference/order-book-list
+
         fetches information on open orders with bid(buy) and ask(sell) prices, volumes and other data for multiple markets
         :param str[]|None symbols: list of unified market symbols, all symbols fetched if None, default is None
         :param int [limit]: not used by upbit fetchOrderBooks()
@@ -532,10 +626,6 @@ class upbit(Exchange, ImplicitAPI):
         ids = None
         if symbols is None:
             ids = ','.join(self.ids)
-            # max URL length is 2083 symbols, including http schema, hostname, tld, etc...
-            if len(ids) > self.options['fetchOrderBooksMaxLength']:
-                numIds = len(self.ids)
-                raise ExchangeError(self.id + ' fetchOrderBooks() has ' + str(numIds) + ' symbols(' + str(len(ids)) + ' characters) exceeding max URL length(' + str(self.options['fetchOrderBooksMaxLength']) + ' characters), you are required to specify a list of symbols in the first argument to fetchOrderBooks')
         else:
             ids = self.market_ids(symbols)
             ids = ','.join(ids)
@@ -589,7 +679,10 @@ class upbit(Exchange, ImplicitAPI):
 
     async def fetch_order_book(self, symbol: str, limit: Int = None, params={}) -> OrderBook:
         """
-        :see: https://docs.upbit.com/reference/%ED%98%B8%EA%B0%80-%EC%A0%95%EB%B3%B4-%EC%A1%B0%ED%9A%8C
+
+        https://docs.upbit.com/kr/reference/호가-정보-조회
+        https://global-docs.upbit.com/reference/order-book-list
+
         fetches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
         :param str symbol: unified symbol of the market to fetch the order book for
         :param int [limit]: the maximum amount of order book entries to return
@@ -657,7 +750,10 @@ class upbit(Exchange, ImplicitAPI):
 
     async def fetch_tickers(self, symbols: Strings = None, params={}) -> Tickers:
         """
-        :see: https://docs.upbit.com/reference/ticker%ED%98%84%EC%9E%AC%EA%B0%80-%EC%A0%95%EB%B3%B4
+
+        https://docs.upbit.com/kr/reference/ticker현재가-정보
+        https://global-docs.upbit.com/reference/tickers
+
         fetches price tickers for multiple markets, statistical information calculated over the past 24 hours for each market
         :param str[]|None symbols: unified symbols of the markets to fetch the ticker for, all market tickers are returned if not assigned
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -668,10 +764,6 @@ class upbit(Exchange, ImplicitAPI):
         ids = None
         if symbols is None:
             ids = ','.join(self.ids)
-            # max URL length is 2083 symbols, including http schema, hostname, tld, etc...
-            if len(ids) > self.options['fetchTickersMaxLength']:
-                numIds = len(self.ids)
-                raise ExchangeError(self.id + ' fetchTickers() has ' + str(numIds) + ' symbols exceeding max URL length, you are required to specify a list of symbols in the first argument to fetchTickers')
         else:
             ids = self.market_ids(symbols)
             ids = ','.join(ids)
@@ -716,7 +808,10 @@ class upbit(Exchange, ImplicitAPI):
 
     async def fetch_ticker(self, symbol: str, params={}) -> Ticker:
         """
-        :see: https://docs.upbit.com/reference/ticker%ED%98%84%EC%9E%AC%EA%B0%80-%EC%A0%95%EB%B3%B4
+
+        https://docs.upbit.com/kr/reference/ticker현재가-정보
+        https://global-docs.upbit.com/reference/tickers
+
         fetches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
         :param str symbol: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -795,7 +890,10 @@ class upbit(Exchange, ImplicitAPI):
 
     async def fetch_trades(self, symbol: str, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
-        :see: https://docs.upbit.com/reference/%EC%B5%9C%EA%B7%BC-%EC%B2%B4%EA%B2%B0-%EB%82%B4%EC%97%AD
+
+        https://docs.upbit.com/kr/reference/최근-체결-내역
+        https://global-docs.upbit.com/reference/today-trades-history
+
         get the list of most recent trades for a particular symbol
         :param str symbol: unified symbol of the market to fetch trades for
         :param int [since]: timestamp in ms of the earliest trade to fetch
@@ -838,7 +936,10 @@ class upbit(Exchange, ImplicitAPI):
 
     async def fetch_trading_fee(self, symbol: str, params={}) -> TradingFeeInterface:
         """
-        :see: https://docs.upbit.com/reference/%EC%A3%BC%EB%AC%B8-%EA%B0%80%EB%8A%A5-%EC%A0%95%EB%B3%B4
+
+        https://docs.upbit.com/kr/reference/주문-가능-정보
+        https://global-docs.upbit.com/reference/available-order-information
+
         fetch the trading fees for a market
         :param str symbol: unified market symbol
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -868,7 +969,7 @@ class upbit(Exchange, ImplicitAPI):
         #         },
         #         "bid_account": {
         #             "currency": "KRW",
-        #             "balance": "0.34202414",
+        #             "balance": "0.34202415",
         #             "locked": "4999.99999922",
         #             "avg_buy_price": "0",
         #             "avg_buy_price_modified": True,
@@ -899,6 +1000,26 @@ class upbit(Exchange, ImplicitAPI):
             'tierBased': False,
         }
 
+    async def fetch_trading_fees(self, params={}) -> TradingFees:
+        """
+        fetch the trading fees for markets
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: a `trading fee structure <https://docs.ccxt.com/#/?id=trading-fee-structure>`
+        """
+        await self.load_markets()
+        fetchMarketResponse = await self.fetch_markets(params)
+        response: dict = {}
+        for i in range(0, len(fetchMarketResponse)):
+            element: dict = {}
+            element['maker'] = self.safe_number(fetchMarketResponse[i], 'maker')
+            element['taker'] = self.safe_number(fetchMarketResponse[i], 'taker')
+            element['symbol'] = self.safe_string(fetchMarketResponse[i], 'symbol')
+            element['percentage'] = True
+            element['tierBased'] = False
+            element['info'] = fetchMarketResponse[i]
+            response[self.safe_string(fetchMarketResponse[i], 'symbol')] = element
+        return response
+
     def parse_ohlcv(self, ohlcv, market: Market = None) -> list:
         #
         #     {
@@ -926,7 +1047,10 @@ class upbit(Exchange, ImplicitAPI):
 
     async def fetch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={}) -> List[list]:
         """
-        :see: https://docs.upbit.com/reference/%EB%B6%84minute-%EC%BA%94%EB%93%A4-1
+
+        https://docs.upbit.com/kr/reference/분minute-캔들-1
+        https://global-docs.upbit.com/reference/minutes
+
         fetches historical candlestick data containing the open, high, low, and close price, and the volume of a market
         :param str symbol: unified symbol of the market to fetch OHLCV data for
         :param str timeframe: the length of time each candle represents
@@ -988,19 +1112,41 @@ class upbit(Exchange, ImplicitAPI):
         #
         return self.parse_ohlcvs(response, market, timeframe, since, limit)
 
+    def calc_order_price(self, symbol: str, amount: float, price: Num = None, params={}) -> str:
+        quoteAmount = None
+        createMarketBuyOrderRequiresPrice = self.safe_value(self.options, 'createMarketBuyOrderRequiresPrice')
+        cost = self.safe_string(params, 'cost')
+        if cost is not None:
+            quoteAmount = self.cost_to_precision(symbol, cost)
+        elif createMarketBuyOrderRequiresPrice:
+            if price is None or amount is None:
+                raise InvalidOrder(self.id + ' createOrder() requires the price and amount argument for market buy orders to calculate the total cost to spend(amount * price), alternatively set the createMarketBuyOrderRequiresPrice option or param to False and pass the cost to spend(quote quantity) in the amount argument')
+            amountString = self.number_to_string(amount)
+            priceString = self.number_to_string(price)
+            costRequest = Precise.string_mul(amountString, priceString)
+            quoteAmount = self.cost_to_precision(symbol, costRequest)
+        else:
+            if amount is None:
+                raise ArgumentsRequired(self.id + ' When createMarketBuyOrderRequiresPrice is False, "amount" is required and should be the total quote amount to spend.')
+            quoteAmount = self.cost_to_precision(symbol, amount)
+        return quoteAmount
+
     async def create_order(self, symbol: str, type: OrderType, side: OrderSide, amount: float, price: Num = None, params={}):
         """
         create a trade order
-        :see: https://docs.upbit.com/reference/%EC%A3%BC%EB%AC%B8%ED%95%98%EA%B8%B0
-        :see: https://global-docs.upbit.com/reference/order
+
+        https://docs.upbit.com/kr/reference/주문하기
+        https://global-docs.upbit.com/reference/order
+
         :param str symbol: unified symbol of the market to create an order in
-        :param str type: 'market' or 'limit'
+        :param str type: supports 'market' and 'limit'. if params.ordType is set to best, a best-type order will be created regardless of the value of type.
         :param str side: 'buy' or 'sell'
         :param float amount: how much you want to trade in units of the base currency
-        :param float [price]: the price at which the order is to be fullfilled, in units of the quote currency, ignored in market orders
+        :param float [price]: the price at which the order is to be fulfilled, in units of the quote currency, ignored in market orders
         :param dict [params]: extra parameters specific to the exchange API endpoint
-        :param float [params.cost]: for market buy orders, the quote quantity that can be used alternative for the amount
-        :param str [params.timeInForce]: 'IOC' or 'FOK'
+        :param float [params.cost]: for market buy and best buy orders, the quote quantity that can be used alternative for the amount
+        :param str [params.ordType]: self field can be used to place a ‘best’ type order
+        :param str [params.timeInForce]: 'IOC' or 'FOK'. only for limit or best type orders. self field is required when the order type is 'best'.
         :returns dict: an `order structure <https://docs.ccxt.com/#/?id=order-structure>`
         """
         await self.load_markets()
@@ -1011,46 +1157,52 @@ class upbit(Exchange, ImplicitAPI):
         elif side == 'sell':
             orderSide = 'ask'
         else:
-            raise InvalidOrder(self.id + ' createOrder() allows buy or sell side only!')
+            raise InvalidOrder(self.id + ' createOrder() supports only buy or sell in the side argument.')
         request: dict = {
             'market': market['id'],
             'side': orderSide,
         }
         if type == 'limit':
+            if price is None or amount is None:
+                raise ArgumentsRequired(self.id + ' the limit type order in createOrder() is required price and amount.')
+            request['ord_type'] = 'limit'
             request['price'] = self.price_to_precision(symbol, price)
-        if (type == 'market') and (side == 'buy'):
-            # for market buy it requires the amount of quote currency to spend
-            quoteAmount = None
-            createMarketBuyOrderRequiresPrice = True
-            createMarketBuyOrderRequiresPrice, params = self.handle_option_and_params(params, 'createOrder', 'createMarketBuyOrderRequiresPrice', True)
-            cost = self.safe_number(params, 'cost')
-            params = self.omit(params, 'cost')
-            if cost is not None:
-                quoteAmount = self.cost_to_precision(symbol, cost)
-            elif createMarketBuyOrderRequiresPrice:
-                if price is None:
-                    raise InvalidOrder(self.id + ' createOrder() requires the price argument for market buy orders to calculate the total cost to spend(amount * price), alternatively set the createMarketBuyOrderRequiresPrice option or param to False and pass the cost to spend(quote quantity) in the amount argument')
-                else:
-                    amountString = self.number_to_string(amount)
-                    priceString = self.number_to_string(price)
-                    costRequest = Precise.string_mul(amountString, priceString)
-                    quoteAmount = self.cost_to_precision(symbol, costRequest)
+            request['volume'] = self.amount_to_precision(symbol, amount)
+        elif type == 'market':
+            if side == 'buy':
+                request['ord_type'] = 'price'
+                orderPrice = self.calc_order_price(symbol, amount, price, params)
+                request['price'] = orderPrice
             else:
-                quoteAmount = self.cost_to_precision(symbol, amount)
-            request['ord_type'] = 'price'
-            request['price'] = quoteAmount
+                if amount is None:
+                    raise ArgumentsRequired(self.id + ' the market sell type order in createOrder() is required amount.')
+                request['ord_type'] = 'market'
+                request['volume'] = self.amount_to_precision(symbol, amount)
         else:
-            request['ord_type'] = type
-            request['volume'] = self.amount_to_precision(symbol, amount)
-        clientOrderId = self.safe_string_2(params, 'clientOrderId', 'identifier')
+            raise InvalidOrder(self.id + ' createOrder() supports only limit or market types in the type argument.')
+        customType = self.safe_string_2(params, 'ordType', 'ord_type')
+        if customType == 'best':
+            params = self.omit(params, ['ordType', 'ord_type'])
+            request['ord_type'] = 'best'
+            if side == 'buy':
+                orderPrice = self.calc_order_price(symbol, amount, price, params)
+                request['price'] = orderPrice
+            else:
+                if amount is None:
+                    raise ArgumentsRequired(self.id + ' the best sell type order in createOrder() is required amount.')
+                request['volume'] = self.amount_to_precision(symbol, amount)
+        clientOrderId = self.safe_string(params, 'clientOrderId')
         if clientOrderId is not None:
             request['identifier'] = clientOrderId
-        if type != 'market':
+        if request['ord_type'] != 'market' and request['ord_type'] != 'price':
             timeInForce = self.safe_string_lower_2(params, 'timeInForce', 'time_in_force')
-            params = self.omit(params, 'timeInForce')
+            params = self.omit(params, ['timeInForce'])
             if timeInForce is not None:
                 request['time_in_force'] = timeInForce
-        params = self.omit(params, ['clientOrderId', 'identifier'])
+            else:
+                if request['ord_type'] == 'best':
+                    raise ArgumentsRequired(self.id + ' the best type order in createOrder() is required timeInForce.')
+        params = self.omit(params, ['clientOrderId', 'cost'])
         response = await self.privatePostOrders(self.extend(request, params))
         #
         #     {
@@ -1076,7 +1228,10 @@ class upbit(Exchange, ImplicitAPI):
 
     async def cancel_order(self, id: str, symbol: Str = None, params={}):
         """
-        :see: https://docs.upbit.com/reference/%EC%A3%BC%EB%AC%B8-%EC%B7%A8%EC%86%8C
+
+        https://docs.upbit.com/kr/reference/주문-취소
+        https://global-docs.upbit.com/reference/order-cancel
+
         cancels an open order
         :param str id: order id
         :param str symbol: not used by upbit cancelOrder()
@@ -1109,9 +1264,113 @@ class upbit(Exchange, ImplicitAPI):
         #
         return self.parse_order(response)
 
+    async def edit_order(self, id: str, symbol: str, type: OrderType, side: OrderSide, amount: Num = None, price: Num = None, params={}) -> Order:
+        """
+
+        https://docs.upbit.com/kr/reference/취소-후-재주문
+        https://global-docs.upbit.com/reference/cancel-and-new
+
+        canceled existing order and create new order. It's only generated same side and symbol canceled order. it returns the data of the canceled order, except for `new_order_uuid` and `new_identifier`. to get the details of the new order, use `fetchOrder(new_order_uuid)`.
+        :param str id: the uuid of the previous order you want to edit.
+        :param str symbol: the symbol of the new order. it must be the same symbol of the previous order.
+        :param str type: the type of the new order. only limit or market is accepted. if params.newOrdType is set to best, a best-type order will be created regardless of the value of type.
+        :param str side: the side of the new order. it must be the same side of the previous order.
+        :param number amount: the amount of the asset you want to buy or sell. It could be overridden by specifying the new_volume parameter in params.
+        :param number price: the price of the asset you want to buy or sell. It could be overridden by specifying the new_price parameter in params.
+        :param dict [params]: extra parameters specific to the exchange API endpoint.
+        :param str [params.clientOrderId]: to identify the previous order, either the id or self field is hasattr(self, required) method.
+        :param float [params.cost]: for market buy and best buy orders, the quote quantity that can be used alternative for the amount.
+        :param str [params.newTimeInForce]: 'IOC' or 'FOK'. only for limit or best type orders. self field is required when the order type is 'best'.
+        :param str [params.newClientOrderId]: the order ID that the user can define.
+        :param str [params.newOrdType]: self field only accepts limit, price, market, or best. You can refer to the Upbit developer documentation for details on how to use self field.
+        :returns dict: An `order structure <https://docs.ccxt.com/#/?id=order-structure>`
+        """
+        await self.load_markets()
+        request: dict = {}
+        prevClientOrderId = self.safe_string(params, 'clientOrderId')
+        params = self.omit(params, 'clientOrderId')
+        if id is not None:
+            request['prev_order_uuid'] = id
+        elif prevClientOrderId is not None:
+            request['prev_order_identifier'] = prevClientOrderId
+        else:
+            raise ArgumentsRequired(self.id + ' editOrder() is required id or clientOrderId.')
+        if type == 'limit':
+            if price is None or amount is None:
+                raise ArgumentsRequired(self.id + ' editOrder() is required price and amount to create limit type order.')
+            request['new_ord_type'] = 'limit'
+            request['new_price'] = self.price_to_precision(symbol, price)
+            request['new_volume'] = self.amount_to_precision(symbol, amount)
+        elif type == 'market':
+            if side == 'buy':
+                request['new_ord_type'] = 'price'
+                orderPrice = self.calc_order_price(symbol, amount, price, params)
+                request['new_price'] = orderPrice
+            else:
+                if amount is None:
+                    raise ArgumentsRequired(self.id + ' editOrder() is required amount to create market sell type order.')
+                request['new_ord_type'] = 'market'
+                request['new_volume'] = self.amount_to_precision(symbol, amount)
+        else:
+            raise InvalidOrder(self.id + ' editOrder() supports only limit or market types in the type argument.')
+        customType = self.safe_string_2(params, 'newOrdType', 'new_ord_type')
+        if customType == 'best':
+            params = self.omit(params, ['newOrdType', 'new_ord_type'])
+            request['new_ord_type'] = 'best'
+            if side == 'buy':
+                orderPrice = self.calc_order_price(symbol, amount, price, params)
+                request['new_price'] = orderPrice
+            else:
+                if amount is None:
+                    raise ArgumentsRequired(self.id + ' editOrder() is required amount to create best sell order.')
+                request['new_volume'] = self.amount_to_precision(symbol, amount)
+        clientOrderId = self.safe_string(params, 'newClientOrderId')
+        if clientOrderId is not None:
+            request['new_identifier'] = clientOrderId
+        if request['new_ord_type'] != 'market' and request['new_ord_type'] != 'price':
+            timeInForce = self.safe_string_lower_2(params, 'newTimeInForce', 'new_time_in_force')
+            params = self.omit(params, ['newTimeInForce', 'new_time_in_force'])
+            if timeInForce is not None:
+                request['new_time_in_force'] = timeInForce
+            else:
+                if request['new_ord_type'] == 'best':
+                    raise ArgumentsRequired(self.id + ' the best type order is required timeInForce.')
+        params = self.omit(params, ['newClientOrderId', 'cost'])
+        # print('check the each request params: ', request)
+        response = await self.privatePostOrdersCancelAndNew(self.extend(request, params))
+        #   {
+        #     uuid: '63b38774-27db-4439-ac20-1be16a24d18e',        #previous order data
+        #     side: 'bid',                                         #previous order data
+        #     ord_type: 'limit',                                   #previous order data
+        #     price: '100000000',                                  #previous order data
+        #     state: 'wait',                                       #previous order data
+        #     market: 'KRW-BTC',                                   #previous order data
+        #     created_at: '2025-04-01T15:30:47+09:00',             #previous order data
+        #     volume: '0.00008',                                   #previous order data
+        #     remaining_volume: '0.00008',                         #previous order data
+        #     reserved_fee: '4',                                   #previous order data
+        #     remaining_fee: '4',                                  #previous order data
+        #     paid_fee: '0',                                       #previous order data
+        #     locked: '8004',                                      #previous order data
+        #     executed_volume: '0',                                #previous order data
+        #     trades_count: '0',                                   #previous order data
+        #     identifier: '21',                                    #previous order data
+        #     new_order_uuid: 'cb1cce56-6237-4a78-bc11-4cfffc1bb4c2',  # new order data
+        #     new_order_identifier: '22'                               # new order data
+        #   }
+        result: dict = {}
+        result['uuid'] = self.safe_string(response, 'new_order_uuid')
+        result['identifier'] = self.safe_string(response, 'new_order_identifier')
+        result['side'] = self.safe_string(response, 'side')
+        result['market'] = self.safe_string(response, 'market')
+        return self.parse_order(result)
+
     async def fetch_deposits(self, code: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Transaction]:
         """
-        :see: https://docs.upbit.com/reference/%EC%9E%85%EA%B8%88-%EB%A6%AC%EC%8A%A4%ED%8A%B8-%EC%A1%B0%ED%9A%8C
+
+        https://docs.upbit.com/kr/reference/입금-리스트-조회
+        https://global-docs.upbit.com/reference/deposit-list-inquiry
+
         fetch all deposits made to an account
         :param str code: unified currency code
         :param int [since]: the earliest time in ms to fetch deposits for
@@ -1152,7 +1411,10 @@ class upbit(Exchange, ImplicitAPI):
     async def fetch_deposit(self, id: str, code: Str = None, params={}):
         """
         fetch information on a deposit
-        :see: https://global-docs.upbit.com/reference/individual-deposit-inquiry
+
+        https://docs.upbit.com/kr/reference/개별-입금-조회
+        https://global-docs.upbit.com/reference/individual-deposit-inquiry
+
         :param str id: the unique id for the deposit
         :param str [code]: unified currency code of the currency deposited
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -1187,7 +1449,10 @@ class upbit(Exchange, ImplicitAPI):
 
     async def fetch_withdrawals(self, code: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Transaction]:
         """
-        :see: https://docs.upbit.com/reference/%EC%A0%84%EC%B2%B4-%EC%B6%9C%EA%B8%88-%EC%A1%B0%ED%9A%8C
+
+        https://docs.upbit.com/kr/reference/전체-출금-조회
+        https://global-docs.upbit.com/reference/withdrawal-list-inquiry
+
         fetch all withdrawals made from an account
         :param str code: unified currency code
         :param int [since]: the earliest time in ms to fetch withdrawals for
@@ -1228,7 +1493,10 @@ class upbit(Exchange, ImplicitAPI):
     async def fetch_withdrawal(self, id: str, code: Str = None, params={}):
         """
         fetch data on a currency withdrawal via the withdrawal id
-        :see: https://global-docs.upbit.com/reference/individual-withdrawal-inquiry
+
+        https://docs.upbit.com/kr/reference/개별-출금-조회
+        https://global-docs.upbit.com/reference/individual-withdrawal-inquiry
+
         :param str id: the unique id for the withdrawal
         :param str [code]: unified currency code of the currency withdrawn
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -1392,12 +1660,55 @@ class upbit(Exchange, ImplicitAPI):
         #         ],
         #     }
         #
+        # fetchOpenOrders, fetchClosedOrders, fetchCanceledOrders
+        #
+        #     {
+        #         "uuid": "637fd66-d019-4d77-bee6-8e0cff28edd9",
+        #         "side": "ask",
+        #         "ord_type": "limit",
+        #         "price": "1.5",
+        #         "state": "wait",
+        #         "market": "SGD-XRP",
+        #         "created_at": "2024-06-05T09:37:10Z",
+        #         "volume": "10",
+        #         "remaining_volume": "10",
+        #         "reserved_fee": "0",
+        #         "remaining_fee": "0",
+        #         "paid_fee": "0",
+        #         "locked": "10",
+        #         "executed_volume": "0",
+        #         "executed_funds": "0",
+        #         "trades_count": 0,
+        #         "time_in_force": "ioc"
+        #     }
+        #
+        #     {
+        #        uuid: '63b38774-27db-4439-ac20-1be16a24d18e',
+        #        side: 'bid',
+        #        ord_type: 'limit',
+        #        price: '100000000',
+        #        state: 'wait',
+        #        market: 'KRW-BTC',
+        #        created_at: '2025-04-01T15:30:47+09:00',
+        #        volume: '0.00008',
+        #        remaining_volume: '0.00008',
+        #        reserved_fee: '4',
+        #        remaining_fee: '4',
+        #        paid_fee: '0',
+        #        locked: '8004',
+        #        executed_volume: '0',
+        #        trades_count: '0',
+        #        identifier: '21',
+        #        new_order_uuid: 'cb1cce56-6237-4a78-bc11-4cfffc1bb4c2',
+        #        new_order_identifier: '22'
+        #      }
         id = self.safe_string(order, 'uuid')
         side = self.safe_string(order, 'side')
         if side == 'bid':
             side = 'buy'
         else:
             side = 'sell'
+        identifier = self.safe_string(order, 'identifier')
         type = self.safe_string(order, 'ord_type')
         timestamp = self.parse8601(self.safe_string(order, 'created_at'))
         status = self.parse_order_status(self.safe_string(order, 'state'))
@@ -1447,17 +1758,16 @@ class upbit(Exchange, ImplicitAPI):
         return self.safe_order({
             'info': order,
             'id': id,
-            'clientOrderId': None,
+            'clientOrderId': identifier,
             'timestamp': timestamp,
             'datetime': self.iso8601(timestamp),
             'lastTradeTimestamp': lastTradeTimestamp,
             'symbol': market['symbol'],
             'type': type,
-            'timeInForce': None,
+            'timeInForce': self.safe_string_upper(order, 'time_in_force'),
             'postOnly': None,
             'side': side,
             'price': price,
-            'stopPrice': None,
             'triggerPrice': None,
             'cost': self.parse_number(cost),
             'average': self.parse_number(average),
@@ -1469,82 +1779,167 @@ class upbit(Exchange, ImplicitAPI):
             'trades': trades,
         })
 
-    async def fetch_orders_by_state(self, state, symbol: Str = None, since: Int = None, limit: Int = None, params={}):
+    async def fetch_open_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
+        """
+        fetch all unfilled currently open orders
+
+        https://docs.upbit.com/kr/reference/대기-주문-조회
+        https://global-docs.upbit.com/reference/open-order
+
+        :param str symbol: unified market symbol
+        :param int [since]: the earliest time in ms to fetch open orders for
+        :param int [limit]: the maximum number of open order structures to retrieve
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param str [params.state]: default is 'wait', set to 'watch' for stop limit orders
+        :returns Order[]: a list of `order structures <https://docs.ccxt.com/#/?id=order-structure>`
+        """
         await self.load_markets()
-        request: dict = {
-            # 'market': self.market_id(symbol),
-            'state': state,
-            # 'page': 1,
-            # 'order_by': 'asc',
-        }
+        request: dict = {}
         market = None
         if symbol is not None:
             market = self.market(symbol)
             request['market'] = market['id']
-        response = await self.privateGetOrders(self.extend(request, params))
+        if limit is not None:
+            request['limit'] = limit
+        response = await self.privateGetOrdersOpen(self.extend(request, params))
         #
         #     [
         #         {
-        #             "uuid": "a08f09b1-1718-42e2-9358-f0e5e083d3ee",
-        #             "side": "bid",
+        #             "uuid": "637fd66-d019-4d77-bee6-8e0cff28edd9",
+        #             "side": "ask",
         #             "ord_type": "limit",
-        #             "price": "17417000.0",
-        #             "state": "done",
-        #             "market": "KRW-BTC",
-        #             "created_at": "2018-04-05T14:09:14+09:00",
-        #             "volume": "1.0",
-        #             "remaining_volume": "0.0",
-        #             "reserved_fee": "26125.5",
-        #             "remaining_fee": "25974.0",
-        #             "paid_fee": "151.5",
-        #             "locked": "17341974.0",
-        #             "executed_volume": "1.0",
-        #             "trades_count":2
-        #         },
+        #             "price": "1.5",
+        #             "state": "wait",
+        #             "market": "SGD-XRP",
+        #             "created_at": "2024-06-05T09:37:10Z",
+        #             "volume": "10",
+        #             "remaining_volume": "10",
+        #             "reserved_fee": "0",
+        #             "remaining_fee": "0",
+        #             "paid_fee": "0",
+        #             "locked": "10",
+        #             "executed_volume": "0",
+        #             "executed_funds": "0",
+        #             "trades_count": 0
+        #         }
         #     ]
         #
         return self.parse_orders(response, market, since, limit)
 
-    async def fetch_open_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
-        """
-        :see: https://docs.upbit.com/reference/%EC%A3%BC%EB%AC%B8-%EB%A6%AC%EC%8A%A4%ED%8A%B8-%EC%A1%B0%ED%9A%8C
-        fetch all unfilled currently open orders
-        :param str symbol: unified market symbol
-        :param int [since]: the earliest time in ms to fetch open orders for
-        :param int [limit]: the maximum number of  open orders structures to retrieve
-        :param dict [params]: extra parameters specific to the exchange API endpoint
-        :returns Order[]: a list of `order structures <https://docs.ccxt.com/#/?id=order-structure>`
-        """
-        return await self.fetch_orders_by_state('wait', symbol, since, limit, params)
-
     async def fetch_closed_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
-        :see: https://docs.upbit.com/reference/%EC%A3%BC%EB%AC%B8-%EB%A6%AC%EC%8A%A4%ED%8A%B8-%EC%A1%B0%ED%9A%8C
         fetches information on multiple closed orders made by the user
+
+        https://docs.upbit.com/kr/reference/종료-주문-조회
+        https://global-docs.upbit.com/reference/closed-order
+
         :param str symbol: unified market symbol of the market orders were made in
         :param int [since]: the earliest time in ms to fetch orders for
         :param int [limit]: the maximum number of order structures to retrieve
         :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param int [params.until]: timestamp in ms of the latest order
         :returns Order[]: a list of `order structures <https://docs.ccxt.com/#/?id=order-structure>`
         """
-        return await self.fetch_orders_by_state('done', symbol, since, limit, params)
+        await self.load_markets()
+        request: dict = {
+            'state': 'done',
+        }
+        market = None
+        if symbol is not None:
+            market = self.market(symbol)
+            request['market'] = market['id']
+        if since is not None:
+            request['start_time'] = since
+        if limit is not None:
+            request['limit'] = limit
+        request, params = self.handle_until_option('end_time', request, params)
+        response = await self.privateGetOrdersClosed(self.extend(request, params))
+        #
+        #     [
+        #         {
+        #             "uuid": "637fd66-d019-4d77-bee6-8e0cff28edd9",
+        #             "side": "ask",
+        #             "ord_type": "limit",
+        #             "price": "1.5",
+        #             "state": "done",
+        #             "market": "SGD-XRP",
+        #             "created_at": "2024-06-05T09:37:10Z",
+        #             "volume": "10",
+        #             "remaining_volume": "10",
+        #             "reserved_fee": "0",
+        #             "remaining_fee": "0",
+        #             "paid_fee": "0",
+        #             "locked": "10",
+        #             "executed_volume": "0",
+        #             "executed_funds": "0",
+        #             "trades_count": 0,
+        #             "time_in_force": "ioc"
+        #         }
+        #     ]
+        #
+        return self.parse_orders(response, market, since, limit)
 
     async def fetch_canceled_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}):
         """
-        :see: https://docs.upbit.com/reference/%EC%A3%BC%EB%AC%B8-%EB%A6%AC%EC%8A%A4%ED%8A%B8-%EC%A1%B0%ED%9A%8C
         fetches information on multiple canceled orders made by the user
+
+        https://docs.upbit.com/kr/reference/종료-주문-조회
+        https://global-docs.upbit.com/reference/closed-order
+
         :param str symbol: unified market symbol of the market orders were made in
         :param int [since]: timestamp in ms of the earliest order, default is None
         :param int [limit]: max number of orders to return, default is None
         :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param int [params.until]: timestamp in ms of the latest order
         :returns dict: a list of `order structures <https://docs.ccxt.com/#/?id=order-structure>`
         """
-        return await self.fetch_orders_by_state('cancel', symbol, since, limit, params)
+        await self.load_markets()
+        request: dict = {
+            'state': 'cancel',
+        }
+        market = None
+        if symbol is not None:
+            market = self.market(symbol)
+            request['market'] = market['id']
+        if since is not None:
+            request['start_time'] = since
+        if limit is not None:
+            request['limit'] = limit
+        request, params = self.handle_until_option('end_time', request, params)
+        response = await self.privateGetOrdersClosed(self.extend(request, params))
+        #
+        #     [
+        #         {
+        #             "uuid": "637fd66-d019-4d77-bee6-8e0cff28edd9",
+        #             "side": "ask",
+        #             "ord_type": "limit",
+        #             "price": "1.5",
+        #             "state": "cancel",
+        #             "market": "SGD-XRP",
+        #             "created_at": "2024-06-05T09:37:10Z",
+        #             "volume": "10",
+        #             "remaining_volume": "10",
+        #             "reserved_fee": "0",
+        #             "remaining_fee": "0",
+        #             "paid_fee": "0",
+        #             "locked": "10",
+        #             "executed_volume": "0",
+        #             "executed_funds": "0",
+        #             "trades_count": 0,
+        #             "time_in_force": "ioc"
+        #         }
+        #     ]
+        #
+        return self.parse_orders(response, market, since, limit)
 
     async def fetch_order(self, id: str, symbol: Str = None, params={}):
         """
-        :see: https://docs.upbit.com/reference/%EA%B0%9C%EB%B3%84-%EC%A3%BC%EB%AC%B8-%EC%A1%B0%ED%9A%8C
+
+        https://docs.upbit.com/kr/reference/개별-주문-조회
+        https://global-docs.upbit.com/reference/individual-order-inquiry
+
         fetches information on an order made by the user
+        :param str id: order id
         :param str symbol: not used by upbit fetchOrder
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: An `order structure <https://docs.ccxt.com/#/?id=order-structure>`
@@ -1599,9 +1994,12 @@ class upbit(Exchange, ImplicitAPI):
         #
         return self.parse_order(response)
 
-    async def fetch_deposit_addresses(self, codes: Strings = None, params={}):
+    async def fetch_deposit_addresses(self, codes: Strings = None, params={}) -> List[DepositAddress]:
         """
-        :see: https://docs.upbit.com/reference/%EC%A0%84%EC%B2%B4-%EC%9E%85%EA%B8%88-%EC%A3%BC%EC%86%8C-%EC%A1%B0%ED%9A%8C
+
+        https://docs.upbit.com/kr/reference/전체-입금-주소-조회
+        https://global-docs.upbit.com/reference/general-deposit-address-inquiry
+
         fetch deposit addresses for multiple currencies and chain types
         :param str[]|None codes: list of unified currency codes, default is None
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -1630,7 +2028,7 @@ class upbit(Exchange, ImplicitAPI):
         #
         return self.parse_deposit_addresses(response, codes)
 
-    def parse_deposit_address(self, depositAddress, currency: Currency = None):
+    def parse_deposit_address(self, depositAddress, currency: Currency = None) -> DepositAddress:
         #
         #    {
         #        currency: 'XRP',
@@ -1646,16 +2044,19 @@ class upbit(Exchange, ImplicitAPI):
         networkId = self.safe_string(depositAddress, 'net_type')
         self.check_address(address)
         return {
+            'info': depositAddress,
             'currency': code,
+            'network': self.network_id_to_code(networkId),
             'address': address,
             'tag': tag,
-            'network': self.network_id_to_code(networkId),
-            'info': depositAddress,
         }
 
-    async def fetch_deposit_address(self, code: str, params={}):
+    async def fetch_deposit_address(self, code: str, params={}) -> DepositAddress:
         """
-        :see: https://docs.upbit.com/reference/%EC%A0%84%EC%B2%B4-%EC%9E%85%EA%B8%88-%EC%A3%BC%EC%86%8C-%EC%A1%B0%ED%9A%8C
+
+        https://docs.upbit.com/kr/reference/개별-입금-주소-조회
+        https://global-docs.upbit.com/reference/individual-deposit-address-inquiry
+
         fetch the deposit address for a currency associated with self account
         :param str code: unified currency code
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -1682,9 +2083,12 @@ class upbit(Exchange, ImplicitAPI):
         #
         return self.parse_deposit_address(response)
 
-    async def create_deposit_address(self, code: str, params={}):
+    async def create_deposit_address(self, code: str, params={}) -> DepositAddress:
         """
-        :see: https://docs.upbit.com/reference/%EC%9E%85%EA%B8%88-%EC%A3%BC%EC%86%8C-%EC%83%9D%EC%84%B1-%EC%9A%94%EC%B2%AD
+
+        https://docs.upbit.com/kr/reference/입금-주소-생성-요청
+        https://global-docs.upbit.com/reference/deposit-address-generation
+
         create a currency deposit address
         :param str code: unified currency code of the currency for the deposit address
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -1717,10 +2121,12 @@ class upbit(Exchange, ImplicitAPI):
             raise AddressPending(self.id + ' is generating ' + code + ' deposit address, call fetchDepositAddress or createDepositAddress one more time later to retrieve the generated address')
         return self.parse_deposit_address(response)
 
-    async def withdraw(self, code: str, amount: float, address: str, tag=None, params={}):
+    async def withdraw(self, code: str, amount: float, address: str, tag: Str = None, params={}) -> Transaction:
         """
-        :see: https://docs.upbit.com/reference/디지털자산-출금하기
-        :see: https://docs.upbit.com/reference/%EC%9B%90%ED%99%94-%EC%B6%9C%EA%B8%88%ED%95%98%EA%B8%B0
+
+        https://docs.upbit.com/kr/reference/디지털자산-출금하기
+        https://global-docs.upbit.com/reference/withdrawal-digital-assets
+
         make a withdrawal
         :param str code: unified currency code
         :param float amount: the amount to withdraw
@@ -1793,11 +2199,8 @@ class upbit(Exchange, ImplicitAPI):
             if (method != 'GET') and (method != 'DELETE'):
                 body = self.json(params)
                 headers['Content-Type'] = 'application/json'
-                if hasQuery:
-                    auth = self.urlencode(query)
-            else:
-                if hasQuery:
-                    auth = self.urlencode(self.keysort(query))
+            if hasQuery:
+                auth = self.rawencode(query)
             if auth is not None:
                 hash = self.hash(self.encode(auth), 'sha512')
                 request['query_hash'] = hash