Fix order cancellation with cURL (Thank you dmzoneill!)

Jon Eyrick · web-flow · commit f3595639910e · 2018-03-13T12:08:59.000-07:00
diff --git a/examples/0.example.php b/examples/0.example.php
diff --git a/examples/agg_trades.php b/examples/agg_trades.php
@@ -0,0 +1,11 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+// Aggregate Trades List
+$trades = $api->aggTrades("BNBBTC");
+print_r($trades);
diff --git a/examples/balances.php b/examples/balances.php
@@ -0,0 +1,11 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+// Get all of your positions, including estimated BTC value
+$balances = $api->balances();
+print_r($balances);
diff --git a/examples/book_prices.php b/examples/book_prices.php
@@ -0,0 +1,11 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+// Get all bid/ask prices
+$bookPrices = $api->bookPrices();
+print_r($bookPrices);
diff --git a/examples/candles.php b/examples/candles.php
@@ -0,0 +1,12 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+// Get Kline/candlestick data for a symbol
+// Periods: 1m,3m,5m,15m,30m,1h,2h,4h,6h,8h,12h,1d,3d,1w,1M
+$ticks = $api->candlesticks("BNBBTC", "5m");
+print_r($ticks);
diff --git a/examples/depth.php b/examples/depth.php
@@ -0,0 +1,11 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+// Get Market Depth
+$depth = $api->depth("ETHBTC");
+print_r($depth);
diff --git a/examples/get_balance.php b/examples/get_balance.php
diff --git a/examples/get_prices.php b/examples/get_prices.php
@@ -0,0 +1,12 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+// Get latest price of a symbol
+$ticker = $api->prices();
+print_r($ticker); // List prices of all symbols
+echo "Price of BNB: {$ticker['BNBBTC']} BTC.\n";
diff --git a/examples/home_directory_config.php b/examples/home_directory_config.php
@@ -2,6 +2,15 @@
 
 require '../php-binance-api.php';
 
+/*
+mkdir -vp ~/.config/jaggedsoft/
+cat >  ~/.config/jaggedsoft/php-binance-api.json << EOF
+{
+    "api-key": "<api key>",
+    "api-secret": "<secret>"
+}
+*/
+
 $api = new Binance\API();
 
 $ticker = $api->prices();
diff --git a/examples/open_orders.php b/examples/open_orders.php
@@ -0,0 +1,11 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+// Get Open Orders
+$openorders = $api->openOrders("BNBBTC");
+print_r($openorders);
diff --git a/examples/orders.php b/examples/orders.php
@@ -0,0 +1,42 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+// Place a LIMIT order
+$quantity = 1;
+$price = 0.0005;
+$order = $api->buy("BNBBTC", $quantity, $price);
+print_r($order);
+
+// Place a MARKET order
+$quantity = 1;
+$order = $api->buy("BNBBTC", $quantity, 0, "MARKET");
+print_r($order);
+
+// Place a STOP LOSS order
+// When the stop is reached, a stop order becomes a market order
+$quantity = 1;
+$price = 0.5; // Try to sell it for 0.5 btc
+$stopPrice = 0.4; // Sell immediately if price goes below 0.4 btc
+$order = $api->sell("BNBBTC", $quantity, $price, "STOP_LOSS", ["stopPrice"=>$stopPrice]);
+print_r($order);
+
+// Place a take profit order
+// When the stop is reached, a stop order becomes a market order
+$quantity = 1;
+$price = 0.5; // Try to sell it for 0.5 btc
+$stopPrice = 0.4; // Sell immediately if price goes below 0.4 btc
+$order = $api->sell("TRXBTC", $quantity, $price, "TAKE_PROFIT", ["stopPrice"=>$stopPrice]);
+print_r($order);
+
+// Place an ICEBERG order
+// Iceberg orders are intended to conceal the true order quantity.
+$quantity = 20;
+$price = 0.5;
+$icebergQty = 10;
+$order = $api->sell("BNBBTC", $quantity, $price, "LIMIT", ["icebergQty"=>$icebergQty]);
+print_r($order);
diff --git a/examples/orders_test.php b/examples/orders_test.php
@@ -0,0 +1,42 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+// Place a LIMIT order
+$quantity = 1000;
+$price = 0.0005;
+$order = $api->buyTest("BNBBTC", $quantity, $price);
+print_r($order);
+
+// Place a MARKET order
+$quantity = 1;
+$order = $api->buyTest("BNBBTC", $quantity, 0, "MARKET");
+print_r($order);
+
+// Place a STOP LOSS order
+// When the stop is reached, a stop order becomes a market order
+$quantity = 1;
+$price = 0.5; // Try to sell it for 0.5 btc
+$stopPrice = 0.4; // Sell immediately if price goes below 0.4 btc
+$order = $api->sellTest("BNBBTC", $quantity, $price, "STOP_LOSS", ["stopPrice"=>$stopPrice]);
+print_r($order);
+
+// Place a take profit order
+// When the stop is reached, a stop order becomes a market order
+$quantity = 1;
+$price = 0.5; // Try to sell it for 0.5 btc
+$stopPrice = 0.4; // Sell immediately if price goes below 0.4 btc
+$order = $api->sellTest("TRXBTC", $quantity, $price, "TAKE_PROFIT", ["stopPrice"=>$stopPrice]);
+print_r($order);
+
+// Place an ICEBERG order
+// Iceberg orders are intended to conceal the true order quantity.
+$quantity = 20;
+$price = 0.5;
+$icebergQty = 10;
+$order = $api->sellTest("BNBBTC", $quantity, $price, "LIMIT", ["icebergQty"=>$icebergQty]);
+print_r($order);
diff --git a/examples/proxy_config.php b/examples/proxy_config.php
@@ -10,7 +10,9 @@
   'pass' => 'd00d'
 ];
 
-$api = new Binance\API("<key>","<secret>",["useServerTime"=>false],$proxyConf);
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API("","",["useServerTime"=>false],$proxyConf);
 
 $ticker = $api->prices();
 print_r($ticker); // List prices of all symbols
diff --git a/examples/single/binance-api-single.php b/examples/single/binance-api-single.php
diff --git a/examples/single/single.php b/examples/single/single.php
diff --git a/examples/trade_history.php b/examples/trade_history.php
@@ -0,0 +1,11 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+// Get Trade History
+$history = $api->history("TRXBTC");
+print_r($history);
diff --git a/examples/web_socket_chart.php b/examples/web_socket_chart.php
@@ -0,0 +1,13 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+// Get complete realtime chart data via WebSockets
+$api->chart(["BNBBTC"], "15m", function($api, $symbol, $chart) {
+    echo "{$symbol} chart update\n";
+    print_r($chart);
+});
diff --git a/examples/web_socket_depth.php b/examples/web_socket_depth.php
@@ -0,0 +1,18 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+$api->depthCache(["BNBBTC"], function($api, $symbol, $depth) {
+    echo "{$symbol} depth cache update\n";
+    $limit = 11; // Show only the closest asks/bids
+    $sorted = $api->sortDepth($symbol, $limit);
+    $bid = $api->first($sorted['bids']);
+    $ask = $api->first($sorted['asks']);
+    echo $api->displayDepth($sorted);
+    echo "ask: {$ask}\n";
+    echo "bid: {$bid}\n";
+});
diff --git a/examples/web_socket_trades.php b/examples/web_socket_trades.php
@@ -0,0 +1,13 @@
+<?php
+
+require '../php-binance-api.php';
+
+// @see home_directory_config.php
+// use config from ~/.confg/jaggedsoft/php-binance-api.json
+$api = new Binance\API();
+
+// Trade Updates via WebSocket
+$api->trades(["BNBBTC"], function($api, $symbol, $trades) {
+    echo "{$symbol} trades update".PHP_EOL;
+    print_r($trades);
+});
diff --git a/php-binance-api.php b/php-binance-api.php
@@ -30,7 +30,7 @@ public function __construct($api_key = '', $api_secret = '', $options = ["useSer
 		$this->api_secret = $api_secret;
 		$this->proxyConf = $proxyConf;
 
-		if ( isset($options['useServerTime']) && $options['useServerTime'] ) {
+		if(isset($options['useServerTime']) && $options['useServerTime']) {
 			$this->useServerTime();
 		}
 
@@ -46,7 +46,7 @@ private function setupApiConfigFromFile()
 		}
 		$contents = json_decode(file_get_contents(getenv("HOME") . "/.config/jaggedsoft/php-binance-api.json"), true);
 		$this->api_key = isset($contents['api-key']) ? $contents['api-key'] : "";
-		$this->api_secret = isset($contents['api_secret']) ? $contents['api_secret'] : "";
+		$this->api_secret = isset($contents['api-secret']) ? $contents['api-secret'] : "";
 	}
 	public function buy($symbol, $quantity, $price, $type = "LIMIT", $flags = []) {
 		return $this->order("BUY", $symbol, $quantity, $price, $type, $flags);
@@ -133,7 +133,7 @@ public function aggTrades($symbol) {
 	}
 	public function depth($symbol) {
 		$json = $this->httpRequest("v1/depth", "GET", ["symbol"=>$symbol]);
-		if ( !isset($this->info[$symbol]) ) $this->info[$symbol] = [];
+		if(!isset($this->info[$symbol])) $this->info[$symbol] = [];
 		$this->info[$symbol]['firstUpdate'] = $json['lastUpdateId'];
 		return $this->depthData($symbol, $json);
 	}
@@ -203,6 +203,12 @@ private function httpRequest($url, $method = "GET", $params = [], $signed = fals
 			curl_setopt($ch, CURLOPT_POST, true);
 			//curl_setopt($ch, CURLOPT_POSTFIELDS, $query);
 		}
+
+		// Delete Method
+		if($method == "DELETE") {
+			curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
+		}
+
 		// proxy settings
 		if(is_array($this->proxyConf)) {
 			curl_setopt($ch, CURLOPT_PROXY, $this->getProxyUriString());
