Merge pull request #24 from natercioluno/master

sync with api updates

Author: neilgarb

src/Luno/Client.php

@@ -166,23 +166,6 @@ public function GetFundingAddress(Request\GetFundingAddress $req): Response\GetF
     return $mapper->map($res, new Response\GetFundingAddress);
   }
 
-  /**
-   * GetLightningReceive makes a call to GET /api/1/lightning/receive/{id}.
-   *
-   * <b>Alpha warning!</b> The Lightning API is still in Alpha stage.
-   * The risks are limited api availability and channel capacity.
-   * 
-   * Lookup the status of a Lightning Receive Invoice.
-   * 
-   * Permissions required: <code>Perm_W_Send</code>
-   */ 
-  public function GetLightningReceive(Request\GetLightningReceive $req): Response\GetLightningReceive
-  {
-    $res = $this->do("GET", "/api/1/lightning/receive/{id}", $req, true);
-    $mapper = new \JsonMapper();
-    return $mapper->map($res, new Response\GetLightningReceive);
-  }
-
   /**
    * GetOrder makes a call to GET /api/1/orders/{id}.
    *
@@ -237,6 +220,22 @@ public function GetOrderBookFull(Request\GetOrderBookFull $req): Response\GetOrd
     return $mapper->map($res, new Response\GetOrderBookFull);
   }
 
+  /**
+   * GetOrderV2 makes a call to GET /api/exchange/2/orders/{id}.
+   *
+   * Get the details for an order.<br>
+   * This endpoint is in BETA, behaviour and specification may change without
+   * any previous notice.
+   * 
+   * Permissions required: <code>Perm_R_Orders</code>
+   */ 
+  public function GetOrderV2(Request\GetOrderV2 $req): Response\GetOrderV2
+  {
+    $res = $this->do("GET", "/api/exchange/2/orders/{id}", $req, true);
+    $mapper = new \JsonMapper();
+    return $mapper->map($res, new Response\GetOrderV2);
+  }
+
   /**
    * GetQuote makes a call to GET /api/1/quotes/{id}.
    *
@@ -324,6 +323,23 @@ public function ListOrders(Request\ListOrders $req): Response\ListOrders
     return $mapper->map($res, new Response\ListOrders);
   }
 
+  /**
+   * ListOrdersV2 makes a call to GET /api/exchange/2/listorders.
+   *
+   * Returns a list of the most recently placed orders. This endpoint will list
+   * up to 100 open orders by default.<br>
+   * This endpoint is in BETA, behaviour and specification may change without
+   * any previous notice.
+   * 
+   * Permissions required: <Code>Perm_R_Orders</Code>
+   */ 
+  public function ListOrdersV2(Request\ListOrdersV2 $req): Response\ListOrdersV2
+  {
+    $res = $this->do("GET", "/api/exchange/2/listorders", $req, true);
+    $mapper = new \JsonMapper();
+    return $mapper->map($res, new Response\ListOrdersV2);
+  }
+
   /**
    * ListPendingTransactions makes a call to GET /api/1/accounts/{id}/pending.
    *
@@ -414,6 +430,19 @@ public function ListWithdrawals(Request\ListWithdrawals $req): Response\ListWith
     return $mapper->map($res, new Response\ListWithdrawals);
   }
 
+  /**
+   * Markets makes a call to GET /api/exchange/1/markets.
+   *
+   * Get all supported markets parameter information like price scale, min and
+   * max volumes and market ID.
+   */ 
+  public function Markets(Request\Markets $req): Response\Markets
+  {
+    $res = $this->do("GET", "/api/exchange/1/markets", $req, false);
+    $mapper = new \JsonMapper();
+    return $mapper->map($res, new Response\Markets);
+  }
+
   /**
    * PostLimitOrder makes a call to POST /api/1/postorder.
    *
@@ -457,24 +486,6 @@ public function PostMarketOrder(Request\PostMarketOrder $req): Response\PostMark
     return $mapper->map($res, new Response\PostMarketOrder);
   }
 
-  /**
-   * ReceiveLightning makes a call to POST /api/1/lightning/receive.
-   *
-   * <b>Alpha warning!</b> The Lightning API is still in Alpha stage.
-   * The risks are limited api availability and channel capacity.
-   * 
-   * Create a lightning invoice which can be used to receive
-   * BTC payments over the lightning network.
-   * 
-   * Permissions required: <code>Perm_W_Send</code>
-   */ 
-  public function ReceiveLightning(Request\ReceiveLightning $req): Response\ReceiveLightning
-  {
-    $res = $this->do("POST", "/api/1/lightning/receive", $req, true);
-    $mapper = new \JsonMapper();
-    return $mapper->map($res, new Response\ReceiveLightning);
-  }
-
   /**
    * Send makes a call to POST /api/1/send.
    *
@@ -491,32 +502,12 @@ public function Send(Request\Send $req): Response\Send
     return $mapper->map($res, new Response\Send);
   }
 
-  /**
-   * SendLightning makes a call to POST /api/1/lightning/send.
-   *
-   * <b>Alpha warning!</b> The Lightning API is still in Alpha stage.
-   * The risks are limited api availability and channel capacity.
-   * 
-   * Send Bitcoin over the Lightning network from your Bitcoin Account.
-   * 
-   * Warning! Cryptocurrency transactions are irreversible. Please ensure your
-   * program has been thoroughly tested before using this call.
-   * 
-   * Permissions required: <code>Perm_W_Send</code>
-   */ 
-  public function SendLightning(Request\SendLightning $req): Response\SendLightning
-  {
-    $res = $this->do("POST", "/api/1/lightning/send", $req, true);
-    $mapper = new \JsonMapper();
-    return $mapper->map($res, new Response\SendLightning);
-  }
-
   /**
    * StopOrder makes a call to POST /api/1/stoporder.
    *
    * Request to stop an Order.
    * 
-   * <b>Note!</b>: Once as Order has been completed, it can not be reversed.
+   * <b>Note!</b>: Once an Order has been completed, it can not be reversed.
    * The return value from this request will indicate if the Stop request was successful or not.
    * 
    * Permissions required: <code>Perm_W_Orders</code>

src/Luno/Request/GetOrderV2.php

@@ -0,0 +1,32 @@
+<?php declare(strict_types=1);
+
+namespace Luno\Request;
+
+class GetOrderV2 extends AbstractRequest
+{
+  /**
+   * Order reference
+   */
+  protected $id;
+  
+  /**
+   * @return string
+   */
+  public function getId(): string
+  {
+    if (!isset($this->id)) {
+      return "";
+    }
+    return $this->id;
+  }
+
+  /**
+   * @param string $id
+   */
+  public function setId(string $id)
+  {
+    $this->id = $id;
+  }
+}
+
+// vi: ft=php

src/Luno/Request/ListOrdersV2.php

@@ -0,0 +1,104 @@
+<?php declare(strict_types=1);
+
+namespace Luno\Request;
+
+class ListOrdersV2 extends AbstractRequest
+{
+  /**
+   * If true, will return closed orders instead of open orders.
+   */
+  protected $closed;
+
+  /**
+   * Filter to orders created before this timestamp (Unix milliseconds)
+   */
+  protected $created_before;
+
+  /**
+   * Limit to this many orders
+   */
+  protected $limit;
+
+  /**
+   * Filter to only orders of this currency pair.
+   */
+  protected $pair;
+  
+  /**
+   * @return bool
+   */
+  public function getClosed(): bool
+  {
+    if (!isset($this->closed)) {
+      return false;
+    }
+    return $this->closed;
+  }
+
+  /**
+   * @param bool $closed
+   */
+  public function setClosed(bool $closed)
+  {
+    $this->closed = $closed;
+  }
+
+  /**
+   * @return int
+   */
+  public function getCreatedBefore(): int
+  {
+    if (!isset($this->created_before)) {
+      return 0;
+    }
+    return $this->created_before;
+  }
+
+  /**
+   * @param int $createdBefore
+   */
+  public function setCreatedBefore(int $createdBefore)
+  {
+    $this->created_before = $createdBefore;
+  }
+
+  /**
+   * @return int
+   */
+  public function getLimit(): int
+  {
+    if (!isset($this->limit)) {
+      return 0;
+    }
+    return $this->limit;
+  }
+
+  /**
+   * @param int $limit
+   */
+  public function setLimit(int $limit)
+  {
+    $this->limit = $limit;
+  }
+
+  /**
+   * @return string
+   */
+  public function getPair(): string
+  {
+    if (!isset($this->pair)) {
+      return "";
+    }
+    return $this->pair;
+  }
+
+  /**
+   * @param string $pair
+   */
+  public function setPair(string $pair)
+  {
+    $this->pair = $pair;
+  }
+}
+
+// vi: ft=php

src/Luno/Request/Markets.php

@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+namespace Luno\Request;
+
+class Markets extends AbstractRequest
+{
+  }
+
+// vi: ft=php

src/Luno/Request/PostLimitOrder.php

@@ -44,6 +44,23 @@ class PostLimitOrder extends AbstractRequest
    * your order won't trade but will go into the order book.
    */
   protected $post_only;
+
+  /**
+   * Side of the trigger price to activate the order. This should be set if `stop_price` is also
+   * set.
+   * 
+   * `RELATIVE_LAST_TRADE` will automatically infer the direction based on the last
+   * trade price and the stop price. If last trade price is less than stop price then stop
+   * direction is ABOVE otherwise is BELOW.
+   */
+  protected $stop_direction;
+
+  /**
+   * Trigger trade price to activate this order as a decimal string. If this
+   * is set then this is treated as a Stop Limit Order and `stop_direction`
+   * is expected to be set too.
+   */
+  protected $stop_price;
 
   /**
    * @return string
@@ -177,6 +194,44 @@ public function setPostOnly(bool $postOnly)
   {
     $this->post_only = $postOnly;
   }
+
+  /**
+   * @return string
+   */
+  public function getStopDirection(): string
+  {
+    if (!isset($this->stop_direction)) {
+      return "";
+    }
+    return $this->stop_direction;
+  }
+
+  /**
+   * @param string $stopDirection
+   */
+  public function setStopDirection(string $stopDirection)
+  {
+    $this->stop_direction = $stopDirection;
+  }
+
+  /**
+   * @return float
+   */
+  public function getStopPrice(): float
+  {
+    if (!isset($this->stop_price)) {
+      return 0;
+    }
+    return $this->stop_price;
+  }
+
+  /**
+   * @param float $stopPrice
+   */
+  public function setStopPrice(float $stopPrice)
+  {
+    $this->stop_price = $stopPrice;
+  }
 }
 
 // vi: ft=php