Skip to content

Commit e660770

Browse files
actions-useractions-user
committed
pushback
1 parent 4872cb5 commit e660770

File tree

8 files changed

+49
-50
lines changed

8 files changed

+49
-50
lines changed

‎binance/ccxt/__init__.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
# ----------------------------------------------------------------------------
2828

29-
__version__ = '4.4.72'
29+
__version__ = '4.4.73'
3030

3131
# ----------------------------------------------------------------------------
3232

@@ -88,9 +88,8 @@
8888
from ccxt.base.errors import error_hierarchy # noqa: F401
8989

9090
from ccxt.binance import binance # noqa: F401
91-
from ccxt.bitfinex1 import bitfinex1 # noqa: F401
9291

93-
exchanges = [ 'binance', 'bitfinex1',]
92+
exchanges = [ 'binance',]
9493

9594
base = [
9695
'Exchange',

‎binance/ccxt/async_support/__init__.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
# -----------------------------------------------------------------------------
1010

11-
__version__ = '4.4.72'
11+
__version__ = '4.4.73'
1212

1313
# -----------------------------------------------------------------------------
1414

@@ -68,9 +68,8 @@
6868

6969

7070
from ccxt.async_support.binance import binance # noqa: F401
71-
from ccxt.async_support.bitfinex1 import bitfinex1 # noqa: F401
7271

73-
exchanges = [ 'binance', 'bitfinex1',]
72+
exchanges = [ 'binance',]
7473

7574
base = [
7675
'Exchange',

‎binance/ccxt/async_support/base/exchange.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# -----------------------------------------------------------------------------
44

5-
__version__ = '4.4.72'
5+
__version__ = '4.4.73'
66

77
# -----------------------------------------------------------------------------
88

‎binance/ccxt/async_support/binance.py‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,12 +1318,13 @@ def describe(self) -> Any:
13181318
},
13191319
'quoteOrderQty': True, # whether market orders support amounts in quote currency
13201320
'broker': {
1321-
'spot': 'x-R4BD3S82',
1322-
'margin': 'x-R4BD3S82',
1323-
'future': 'x-xcKtGhcu',
1321+
'spot': 'x-TKT5PX2F',
1322+
'margin': 'x-TKT5PX2F',
1323+
'future': 'x-cvBPrNm9',
13241324
'delivery': 'x-xcKtGhcu',
1325-
'swap': 'x-xcKtGhcu',
1325+
'swap': 'x-cvBPrNm9',
13261326
'option': 'x-xcKtGhcu',
1327+
'inverse': 'x-xcKtGhcu',
13271328
},
13281329
'accountsByType': {
13291330
'main': 'MAIN',
@@ -5162,7 +5163,7 @@ async def edit_spot_order(self, id: str, symbol: str, type: OrderType, side: Ord
51625163
# "symbol": "BTCUSDT",
51635164
# "orderId": 16383176297,
51645165
# "orderListId": -1,
5165-
# "clientOrderId": "x-R4BD3S8222ecb58eb9074fb1be018c",
5166+
# "clientOrderId": "x-TKT5PX2F22ecb58eb9074fb1be018c",
51665167
# "transactTime": 1670891847932,
51675168
# "price": "13500.00000000",
51685169
# "origQty": "0.00085000",
@@ -5518,7 +5519,7 @@ def parse_order(self, order: dict, market: Market = None) -> Order:
55185519
# "symbol": "BTCUSDT",
55195520
# "orderId": 16383176297,
55205521
# "orderListId": -1,
5521-
# "clientOrderId": "x-R4BD3S8222ecb58eb9074fb1be018c",
5522+
# "clientOrderId": "x-TKT5PX2F22ecb58eb9074fb1be018c",
55225523
# "transactTime": 1670891847932,
55235524
# "price": "13500.00000000",
55245525
# "origQty": "0.00085000",
@@ -5581,7 +5582,7 @@ def parse_order(self, order: dict, market: Market = None) -> Order:
55815582
# "symbol": "BTCUSDT",
55825583
# "orderId": 5403233939,
55835584
# "orderListId": -1,
5584-
# "clientOrderId": "x-R4BD3S825e669e75b6c14f69a2c43e",
5585+
# "clientOrderId": "x-TKT5PX2F5e669e75b6c14f69a2c43e",
55855586
# "transactTime": 1617151923742,
55865587
# "price": "0.00000000",
55875588
# "origQty": "0.00050000",
@@ -5756,7 +5757,7 @@ def parse_order(self, order: dict, market: Market = None) -> Order:
57565757
# createOrder, cancelAllOrders, cancelOrder: portfolio margin spot margin
57575758
#
57585759
# {
5759-
# "clientOrderId": "x-R4BD3S82e9ef29d8346440f0b28b86",
5760+
# "clientOrderId": "x-TKT5PX2Fe9ef29d8346440f0b28b86",
57605761
# "cummulativeQuoteQty": "0.00000000",
57615762
# "executedQty": "0.00000000",
57625763
# "fills": [],
@@ -5777,7 +5778,7 @@ def parse_order(self, order: dict, market: Market = None) -> Order:
57775778
# {
57785779
# "symbol": "BTCUSDT",
57795780
# "orderId": 24700763749,
5780-
# "clientOrderId": "x-R4BD3S826f724c2a4af6425f98c7b6",
5781+
# "clientOrderId": "x-TKT5PX2F6f724c2a4af6425f98c7b6",
57815782
# "price": "35000.00000000",
57825783
# "origQty": "0.00100000",
57835784
# "executedQty": "0.00000000",
@@ -6316,8 +6317,11 @@ def create_order_request(self, symbol: str, type: OrderType, side: OrderSide, am
63166317
clientOrderIdRequest = 'newClientStrategyId' if isPortfolioMarginConditional else 'newClientOrderId'
63176318
if clientOrderId is None:
63186319
broker = self.safe_dict(self.options, 'broker', {})
6319-
defaultId = 'x-xcKtGhcu' if (market['contract']) else 'x-R4BD3S82'
6320-
brokerId = self.safe_string(broker, marketType, defaultId)
6320+
defaultId = 'x-xcKtGhcu' if (market['contract']) else 'x-TKT5PX2F'
6321+
idMarketType = 'spot'
6322+
if market['contract']:
6323+
idMarketType = 'swap' if (market['swap'] and market['linear']) else 'inverse'
6324+
brokerId = self.safe_string(broker, idMarketType, defaultId)
63216325
request[clientOrderIdRequest] = brokerId + self.uuid22()
63226326
else:
63236327
request[clientOrderIdRequest] = clientOrderId
@@ -6836,7 +6840,7 @@ async def fetch_orders(self, symbol: Str = None, since: Int = None, limit: Int =
68366840
# {
68376841
# "symbol": "BTCUSDT",
68386842
# "orderId": 24684460474,
6839-
# "clientOrderId": "x-R4BD3S82e9ef29d8346440f0b28b86",
6843+
# "clientOrderId": "x-TKT5PX2Fe9ef29d8346440f0b28b86",
68406844
# "price": "35000.00000000",
68416845
# "origQty": "0.00100000",
68426846
# "executedQty": "0.00000000",
@@ -7449,7 +7453,7 @@ async def cancel_all_orders(self, symbol: Str = None, params={}):
74497453
# [
74507454
# {
74517455
# "symbol": "ADAUSDT",
7452-
# "origClientOrderId": "x-R4BD3S82662cde7a90114475b86e21",
7456+
# "origClientOrderId": "x-TKT5PX2F662cde7a90114475b86e21",
74537457
# "orderId": 3935107,
74547458
# "orderListId": -1,
74557459
# "clientOrderId": "bqM2w1oTlugfRAjnTIFBE8",
@@ -11324,7 +11328,7 @@ def sign(self, path, api='public', method='GET', params={}, headers=None, body=N
1132411328
if newClientOrderId is None:
1132511329
isSpotOrMargin = (api.find('sapi') > -1 or api == 'private')
1132611330
marketType = 'spot' if isSpotOrMargin else 'future'
11327-
defaultId = 'x-xcKtGhcu' if (not isSpotOrMargin) else 'x-R4BD3S82'
11331+
defaultId = 'x-xcKtGhcu' if (not isSpotOrMargin) else 'x-TKT5PX2F'
1132811332
broker = self.safe_dict(self.options, 'broker', {})
1132911333
brokerId = self.safe_string(broker, marketType, defaultId)
1133011334
params['newClientOrderId'] = brokerId + self.uuid22()

‎binance/ccxt/base/exchange.py‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# -----------------------------------------------------------------------------
66

7-
__version__ = '4.4.72'
7+
__version__ = '4.4.73'
88

99
# -----------------------------------------------------------------------------
1010

@@ -6471,19 +6471,13 @@ def sort_cursor_paginated_result(self, result):
64716471
return self.sort_by(result, 'id', True)
64726472
return result
64736473

6474-
def remove_repeated_elements_from_array(self, input):
6474+
def remove_repeated_elements_from_array(self, input, fallbackToTimestamp: bool = True):
64756475
uniqueResult = {}
64766476
for i in range(0, len(input)):
64776477
entry = input[i]
6478-
id = self.safe_string(entry, 'id')
6479-
if id is not None:
6480-
if self.safe_string(uniqueResult, id) is None:
6481-
uniqueResult[id] = entry
6482-
else:
6483-
timestamp = self.safe_integer_2(entry, 'timestamp', 0)
6484-
if timestamp is not None:
6485-
if self.safe_string(uniqueResult, timestamp) is None:
6486-
uniqueResult[timestamp] = entry
6478+
uniqValue = self.safe_string_n(entry, ['id', 'timestamp', 0]) if fallbackToTimestamp else self.safe_string(entry, 'id')
6479+
if uniqValue is not None and not (uniqValue in uniqueResult):
6480+
uniqueResult[uniqValue] = entry
64876481
values = list(uniqueResult.values())
64886482
valuesLength = len(values)
64896483
if valuesLength > 0:

‎binance/ccxt/binance.py‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,12 +1317,13 @@ def describe(self) -> Any:
13171317
},
13181318
'quoteOrderQty': True, # whether market orders support amounts in quote currency
13191319
'broker': {
1320-
'spot': 'x-R4BD3S82',
1321-
'margin': 'x-R4BD3S82',
1322-
'future': 'x-xcKtGhcu',
1320+
'spot': 'x-TKT5PX2F',
1321+
'margin': 'x-TKT5PX2F',
1322+
'future': 'x-cvBPrNm9',
13231323
'delivery': 'x-xcKtGhcu',
1324-
'swap': 'x-xcKtGhcu',
1324+
'swap': 'x-cvBPrNm9',
13251325
'option': 'x-xcKtGhcu',
1326+
'inverse': 'x-xcKtGhcu',
13261327
},
13271328
'accountsByType': {
13281329
'main': 'MAIN',
@@ -5161,7 +5162,7 @@ def edit_spot_order(self, id: str, symbol: str, type: OrderType, side: OrderSide
51615162
# "symbol": "BTCUSDT",
51625163
# "orderId": 16383176297,
51635164
# "orderListId": -1,
5164-
# "clientOrderId": "x-R4BD3S8222ecb58eb9074fb1be018c",
5165+
# "clientOrderId": "x-TKT5PX2F22ecb58eb9074fb1be018c",
51655166
# "transactTime": 1670891847932,
51665167
# "price": "13500.00000000",
51675168
# "origQty": "0.00085000",
@@ -5517,7 +5518,7 @@ def parse_order(self, order: dict, market: Market = None) -> Order:
55175518
# "symbol": "BTCUSDT",
55185519
# "orderId": 16383176297,
55195520
# "orderListId": -1,
5520-
# "clientOrderId": "x-R4BD3S8222ecb58eb9074fb1be018c",
5521+
# "clientOrderId": "x-TKT5PX2F22ecb58eb9074fb1be018c",
55215522
# "transactTime": 1670891847932,
55225523
# "price": "13500.00000000",
55235524
# "origQty": "0.00085000",
@@ -5580,7 +5581,7 @@ def parse_order(self, order: dict, market: Market = None) -> Order:
55805581
# "symbol": "BTCUSDT",
55815582
# "orderId": 5403233939,
55825583
# "orderListId": -1,
5583-
# "clientOrderId": "x-R4BD3S825e669e75b6c14f69a2c43e",
5584+
# "clientOrderId": "x-TKT5PX2F5e669e75b6c14f69a2c43e",
55845585
# "transactTime": 1617151923742,
55855586
# "price": "0.00000000",
55865587
# "origQty": "0.00050000",
@@ -5755,7 +5756,7 @@ def parse_order(self, order: dict, market: Market = None) -> Order:
57555756
# createOrder, cancelAllOrders, cancelOrder: portfolio margin spot margin
57565757
#
57575758
# {
5758-
# "clientOrderId": "x-R4BD3S82e9ef29d8346440f0b28b86",
5759+
# "clientOrderId": "x-TKT5PX2Fe9ef29d8346440f0b28b86",
57595760
# "cummulativeQuoteQty": "0.00000000",
57605761
# "executedQty": "0.00000000",
57615762
# "fills": [],
@@ -5776,7 +5777,7 @@ def parse_order(self, order: dict, market: Market = None) -> Order:
57765777
# {
57775778
# "symbol": "BTCUSDT",
57785779
# "orderId": 24700763749,
5779-
# "clientOrderId": "x-R4BD3S826f724c2a4af6425f98c7b6",
5780+
# "clientOrderId": "x-TKT5PX2F6f724c2a4af6425f98c7b6",
57805781
# "price": "35000.00000000",
57815782
# "origQty": "0.00100000",
57825783
# "executedQty": "0.00000000",
@@ -6315,8 +6316,11 @@ def create_order_request(self, symbol: str, type: OrderType, side: OrderSide, am
63156316
clientOrderIdRequest = 'newClientStrategyId' if isPortfolioMarginConditional else 'newClientOrderId'
63166317
if clientOrderId is None:
63176318
broker = self.safe_dict(self.options, 'broker', {})
6318-
defaultId = 'x-xcKtGhcu' if (market['contract']) else 'x-R4BD3S82'
6319-
brokerId = self.safe_string(broker, marketType, defaultId)
6319+
defaultId = 'x-xcKtGhcu' if (market['contract']) else 'x-TKT5PX2F'
6320+
idMarketType = 'spot'
6321+
if market['contract']:
6322+
idMarketType = 'swap' if (market['swap'] and market['linear']) else 'inverse'
6323+
brokerId = self.safe_string(broker, idMarketType, defaultId)
63206324
request[clientOrderIdRequest] = brokerId + self.uuid22()
63216325
else:
63226326
request[clientOrderIdRequest] = clientOrderId
@@ -6835,7 +6839,7 @@ def fetch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None,
68356839
# {
68366840
# "symbol": "BTCUSDT",
68376841
# "orderId": 24684460474,
6838-
# "clientOrderId": "x-R4BD3S82e9ef29d8346440f0b28b86",
6842+
# "clientOrderId": "x-TKT5PX2Fe9ef29d8346440f0b28b86",
68396843
# "price": "35000.00000000",
68406844
# "origQty": "0.00100000",
68416845
# "executedQty": "0.00000000",
@@ -7448,7 +7452,7 @@ def cancel_all_orders(self, symbol: Str = None, params={}):
74487452
# [
74497453
# {
74507454
# "symbol": "ADAUSDT",
7451-
# "origClientOrderId": "x-R4BD3S82662cde7a90114475b86e21",
7455+
# "origClientOrderId": "x-TKT5PX2F662cde7a90114475b86e21",
74527456
# "orderId": 3935107,
74537457
# "orderListId": -1,
74547458
# "clientOrderId": "bqM2w1oTlugfRAjnTIFBE8",
@@ -11323,7 +11327,7 @@ def sign(self, path, api='public', method='GET', params={}, headers=None, body=N
1132311327
if newClientOrderId is None:
1132411328
isSpotOrMargin = (api.find('sapi') > -1 or api == 'private')
1132511329
marketType = 'spot' if isSpotOrMargin else 'future'
11326-
defaultId = 'x-xcKtGhcu' if (not isSpotOrMargin) else 'x-R4BD3S82'
11330+
defaultId = 'x-xcKtGhcu' if (not isSpotOrMargin) else 'x-TKT5PX2F'
1132711331
broker = self.safe_dict(self.options, 'broker', {})
1132811332
brokerId = self.safe_string(broker, marketType, defaultId)
1132911333
params['newClientOrderId'] = brokerId + self.uuid22()

‎binance/ccxt/pro/__init__.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
# ----------------------------------------------------------------------------
1010

11-
__version__ = '4.4.72'
11+
__version__ = '4.4.73'
1212

1313
# ----------------------------------------------------------------------------
1414

@@ -17,6 +17,5 @@
1717
# CCXT Pro exchanges (now this is mainly used for importing exchanges in WS tests)
1818

1919
from ccxt.pro.binance import binance # noqa: F401
20-
from ccxt.pro.bitfinex1 import bitfinex1 # noqa: F401
2120

22-
exchanges = [ 'binance', 'bitfinex1',]
21+
exchanges = [ 'binance',]

‎build/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"fs": "*",
1818
"path": "*",
1919
"semver": "^7.7.1",
20-
"typescript": "^5.8.2"
20+
"typescript": "^5.8.3"
2121
},
2222
"devDependencies": {
2323
"tsx": "^4.19.3"

0 commit comments

Comments
 (0)