Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 45 additions & 15 deletions php-binance-api.php
Original file line number Diff line number Diff line change
Expand Up @@ -1716,6 +1716,13 @@ protected function httpRequest(string $url, string $method = "GET", array $param
// params so buildquery string and append to url
elseif (count($params) > 0) {
$this->curl_set_url($curl, $base . $url . '?' . $query);
// USER_STREAM and MARKET_DATA endpoints need the api key without a signature,
// so send it on every unsigned request when available
if (!empty($this->api_key)) {
curl_setopt($curl, CURLOPT_HTTPHEADER, array(
'X-MBX-APIKEY: ' . $this->api_key,
));
}
}
// no params so just the base url
else {
Expand Down Expand Up @@ -3679,7 +3686,7 @@ public function orderAmendments(string $symbol, string $orderId, ?string $fromEx
/**
* ocoOrder - Create a new OCO order
*
* @link https://binance-docs.github.io/apidocs/spot/en/#new-oco-trade
* @link https://developers.binance.com/docs/binance-spot-api-docs/rest-api/trading-endpoints#new-order-list---oco-trade
*
* @property int $weight 1
*
Expand Down Expand Up @@ -3709,36 +3716,56 @@ public function ocoOrder(string $side, string $symbol, $quantity, $price, $stopp
$request['quantity'] = $quantity;
}

// POST v3/order/oco was removed by Binance; v3/orderList/oco expects the two legs
// as above*/below* parameters: the LIMIT_MAKER leg sits above the market price for
// SELL and below it for BUY, the stop leg is always on the opposite side
$isSell = strtoupper($side) === 'SELL';
$limitPrefix = $isSell ? 'above' : 'below';
$stopPrefix = $isSell ? 'below' : 'above';

if (is_numeric($price) === false) {
$error = "Parameter price expected numeric for ' $side . ' ' . $symbol .', got " . gettype($price);
trigger_error($error, E_USER_ERROR);
} else {
$request['price'] = $price;
$request[$limitPrefix . 'Type'] = 'LIMIT_MAKER';
$request[$limitPrefix . 'Price'] = $price;
}

if (is_numeric($stopprice) === false) {
$error = "Parameter stopprice expected numeric for ' $side . ' ' . $symbol .', got " . gettype($stopprice);
trigger_error($error, E_USER_ERROR);
} else {
$request['stopPrice'] = $stopprice;
$request[$stopPrefix . 'StopPrice'] = $stopprice;
}

if (is_null($stoplimitprice) === false && empty($stoplimitprice) === false) {
$request['stopLimitPrice'] = $stoplimitprice;
$request[$stopPrefix . 'Type'] = 'STOP_LOSS_LIMIT';
$request[$stopPrefix . 'Price'] = $stoplimitprice;
if ( ($stoplimittimeinforce == 'FOK') || ($stoplimittimeinforce == 'IOC') ) {
$request['stopLimitTimeInForce'] = $stoplimittimeinforce;
$request[$stopPrefix . 'TimeInForce'] = $stoplimittimeinforce;
} else {
$request['stopLimitTimeInForce'] = 'GTC'; // `Good 'till cancel`. Needed if flag `stopLimitPrice` used.
$request[$stopPrefix . 'TimeInForce'] = 'GTC'; // `Good 'till cancel`. Needed if flag `stopLimitPrice` used.
}
} else {
$request[$stopPrefix . 'Type'] = 'STOP_LOSS';
}

// Check other flags
foreach (array('icebergQty','stopIcebergQty','listClientOrderId','limitClientOrderId','stopClientOrderId','newOrderRespType') as $flag) {
if ( isset($params[$flag]) && !empty($params[$flag]) )
$request[$flag] = $params[$flag];
// Remap legacy order/oco flags to their orderList/oco equivalents;
// anything else in $params (listClientOrderId, newOrderRespType, above*/below* flags) passes through
$legacyFlags = array(
'icebergQty' => $limitPrefix . 'IcebergQty',
'stopIcebergQty' => $stopPrefix . 'IcebergQty',
'limitClientOrderId' => $limitPrefix . 'ClientOrderId',
'stopClientOrderId' => $stopPrefix . 'ClientOrderId',
);
foreach ($legacyFlags as $legacyFlag => $newFlag) {
if ( isset($params[$legacyFlag]) && !empty($params[$legacyFlag]) ) {
$request[$newFlag] = $params[$legacyFlag];
unset($params[$legacyFlag]);
}
}

return $this->apiRequest("v3/order/oco", "POST", $request, true);
return $this->apiRequest("v3/orderList/oco", "POST", array_merge($request, $params), true);
}

/**
Expand Down Expand Up @@ -3784,6 +3811,8 @@ public function avgPrice(string $symbol, array $params = [])
/**
* bswapQuote - Request a quote for swap of quote asset (selling) or base asset (buying), essentially price/exchange rates.
*
* @deprecated Binance Liquid Swap (BSwap) was decommissioned by Binance in 2023; the endpoint no longer works
*
* @property int $weight 2
*
* @param string $baseAsset (mandatory) e.g. ETH
Expand All @@ -3794,6 +3823,7 @@ public function avgPrice(string $symbol, array $params = [])
* @throws \Exception
*/
public function bswapQuote($baseAsset, $quoteAsset, $quoteQty, array $params = []) {
trigger_error('Deprecated - Binance Liquid Swap (BSwap) was decommissioned by Binance in 2023, the endpoint no longer works.', E_USER_DEPRECATED);
$request = [
'quoteAsset' => $quoteAsset,
'baseAsset' => $baseAsset,
Expand Down Expand Up @@ -5779,10 +5809,10 @@ public function futuresMultiAssetsMarginMode(array $params = [])
public function futuresSetMultiAssetsMarginMode(bool $multiAssetsMarginMode, array $params = [])
{
$request = [
'multiAssetsMarginMode' => $multiAssetsMarginMode ? 'true' : 'false',
'multiAssetsMargin' => $multiAssetsMarginMode ? 'true' : 'false',
];

return $this->fapiRequest("v1/multiAssetsMarginMode", 'POST', array_merge($request, $params), true);
return $this->fapiRequest("v1/multiAssetsMargin", 'POST', array_merge($request, $params), true);
}

/**
Expand Down Expand Up @@ -6325,7 +6355,7 @@ public function futuresTradingStatus($symbol = null, array $params = [])
* futuresDownloadId
* helper for other metods for getting download id
*/
protected function futuresDownloadId($startTime, $endTime, ?array $params = null, string $url = '')
protected function futuresDownloadId($startTime, $endTime, array $params = [], string $url = '')
{
$request = [
'startTime' => $startTime,
Expand All @@ -6339,7 +6369,7 @@ protected function futuresDownloadId($startTime, $endTime, ?array $params = null
* futuresDownloadLinkByDownloadId
* helper for other metods for getting download link by download id
*/
protected function futuresDownloadLinkByDownloadId(string $downloadId, ?array $params = null, string $url = '')
protected function futuresDownloadLinkByDownloadId(string $downloadId, array $params = [], string $url = '')
{
$request = [
'downloadId' => $downloadId,
Expand Down
17 changes: 10 additions & 7 deletions tests/BinanceStaticTests.php
Original file line number Diff line number Diff line change
Expand Up @@ -1249,17 +1249,20 @@ public function testOcoOrder()
} catch (\Throwable $e) {

}
$this->assertEquals("https://api.binance.com/api/v3/order/oco", self::$capturedUrl);
$this->assertEquals("https://api.binance.com/api/v3/orderList/oco", self::$capturedUrl);

parse_str(self::$capturedBody, $params);

// side is BUY: the LIMIT_MAKER leg sits below the market price, the stop leg above
$this->assertEquals($this->side, $params['side']);
$this->assertEquals($this->symbol, $params['symbol']);
$this->assertEquals($this->quantity, $params['quantity']);
$this->assertEquals($this->price, $params['price']);
$this->assertEquals($this->stopprice, $params['stopPrice']);
$this->assertEquals($this->stoplimitprice, $params['stopLimitPrice']);
$this->assertEquals('GTC', $params['stopLimitTimeInForce']);
$this->assertEquals('LIMIT_MAKER', $params['belowType']);
$this->assertEquals($this->price, $params['belowPrice']);
$this->assertEquals('STOP_LOSS_LIMIT', $params['aboveType']);
$this->assertEquals($this->stopprice, $params['aboveStopPrice']);
$this->assertEquals($this->stoplimitprice, $params['abovePrice']);
$this->assertEquals('GTC', $params['aboveTimeInForce']);
}

public function testSpotAvgPrice()
Expand Down Expand Up @@ -2628,11 +2631,11 @@ public function testFuturesSetMultiAssetsMarginMode()
} catch (\Throwable $e) {

}
$this->assertEquals("https://fapi.binance.com/fapi/v1/multiAssetsMarginMode", self::$capturedUrl);
$this->assertEquals("https://fapi.binance.com/fapi/v1/multiAssetsMargin", self::$capturedUrl);

parse_str(self::$capturedBody, $params);

$this->assertEquals($this->multiAssetsMarginMode, $params['multiAssetsMarginMode']);
$this->assertEquals('true', $params['multiAssetsMargin']);
$this->assertEquals($this->recvWindow, $params['recvWindow']);
}

Expand Down
Loading