Dev - added pagination in order fetch API.

Author: Raunak Gupta

.php-cs-fixer.dist.php

@@ -11,7 +11,7 @@
     'braces' => true,
     'cast_spaces' => true,
     'concat_space' => [
-        'spacing' => 'none',
+        'spacing' => 'one',
     ],
     'declare_equal_normalize' => true,
     'elseif' => true,

README.md

@@ -1,24 +1,59 @@
 # WazirX Portfolio Tracker
 
-Free and open source solution to track your Wazirx Portfolio
+**Free and open source solution to track your Wazirx Portfolio.**  
+
+![wazirx rofit tracker thumbnail](screenshots/table-view.png "Sample Portfolio Overview")
+
+Are you using WazirX for cryptocurrency trading? If yes, then you know that it only provides the list of crypto that you hold with quantity but did not tell you, that you are in a profit or lose or how your portfolio is doing overtime.  
+So you can use this tool to get that details.
+
+Oh, that's great but for this do I have to spin a server and install it?  
+If you want you can do that but you can use [this link](), where I have already made it accessible for all the non-technical people.
+
+### Features include:
+
+Track all your crypto assets growth of WazirX exchange in one go. You can filter it or order/sort it based on profit, amount spend, etc.  
+
+Oh, that's great, but I think it is missing this thing, or if you can add this it will make much more sense.  
+Sure, please let me know [here](https://github.com/finallyRaunak/wazirx-portfolio-tracker/discussions/new) so that I can review and see how it can be incorporated.
+
+### Why this?
+
+It is a simple tool to take a quick snap of your portfolio.
+
+# Demo
+
+- You can see a live preview from [here]()
+- You can also check this [screenshot](screenshots/full-page-view.png)
 
 # Installation
 
-- Download the the zip
+- Download the zip
 - Extract the zip
-- From cli cd to the extracted dir
+- From CLI cd to the extracted dir
 - run composer install
 - Update the `BASE_URL` in `src/constants.php` file.
+- Now Navigate to your site (_which you have defined in `BASE_URL`_) and see the report.
 
 # Donate
 
+Like it? considering donating a few dollars (even 1 USDT) keeps us motivated to build such a tool that can ease up your crypto journey.  
+You can donate to the below given address.
+
 | Currency | Network | Address                                      |
 |----------|---------|----------------------------------------------|
-| BUSD     | BEP20   | `0x4Fabb145d64652a948d72533023f6E7A623C7C53` |
-| USDT     | BEP20   |                                              |
-| USDT     | TRC20   |                                              |
+| ETH      | BEP20   | `0x162AB205bb9fac0e423F31C7e5E974E649E5980c` |
+| BUSD     | BEP20   | `0x162AB205bb9fac0e423F31C7e5E974E649E5980c` |
+| USDT     | ERC20   | `0x162AB205bb9fac0e423F31C7e5E974E649E5980c` |
+| USDT     | BEP20   | `0x162AB205bb9fac0e423F31C7e5E974E649E5980c` |
+| USDT     | TRC20   | `TQVWzF8iXmYSwNmAkBNfKMpv9YwRjSWXtq`         |
 
 
 # Disclaimer 
+
 - This is an unofficial WazirX Portfolio Tracker which enhances the wallet user experience. The brand and copyright of the word "WazirX" belong to WazirX (https://wazirx.com).
-- I do not recommend that any cryptocurrency should be bought, sold, or held by you. Do conduct your own due diligence and consult your financial advisor before making any investment decisions.
+- I do not recommend that any cryptocurrency should be bought, sold, or held by you. Do conduct your due diligence and consult your financial advisor before making any investment decisions.
+
+# License
+
+wazirx-portfolio-tracker is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.

src/BalanceSheet.php

@@ -7,6 +7,8 @@
 
 class BalanceSheet
 {
+    private $orderArr;
+
     public function index()
     {
         $this->render_view('wrx', [
@@ -75,8 +77,8 @@ public function getMarketPrice(array $cryptoList, array $tradingPair): array
                 if ($crypto == 'wrx' && $base == 'wrx') {
                     continue;
                 }
-                $location = array_search($crypto.$base, array_column($tickers, 'symbol'));
-                $price[$crypto.'/'.$base]['current_price'] = $tickers[$location]['bidPrice'];
+                $location = array_search($crypto . $base, array_column($tickers, 'symbol'));
+                $price[$crypto . '/' . $base]['current_price'] = $tickers[$location]['bidPrice'];
             }
         }
 
@@ -112,10 +114,14 @@ private function pullOrders($wrx, string $crypto, array $tradingPair)
     {
         $price = [];
         foreach ($tradingPair as $base) {
-            if (!$wrx->isValidTradingPair($crypto.$base)) {
+            $this->orderArr = [];
+
+            if (!$wrx->isValidTradingPair($crypto . $base)) {
                 continue;
             }
-            $orders = $wrx->getOrders($crypto.$base);
+
+            $orders = $this->getSequentialOrders($wrx, $crypto . $base, 0);
+
             $qty = $invest = 0;
             if (empty($orders) || (!empty($orders['code']) && ($orders['code'] == 1999))) {
                 continue;
@@ -141,11 +147,11 @@ private function pullOrders($wrx, string $crypto, array $tradingPair)
             if (empty($qty)) {
                 continue;
             }
-            $price[$crypto.'/'.$base] = [
+            $price[$crypto . '/' . $base] = [
                 'dca' => $invest / $qty,
                 'qty' => $qty,
             ];
-            $price[$crypto.'/'.$base]['investment'] = $price[$crypto.'/'.$base]['dca'] * $price[$crypto.'/'.$base]['qty'];
+            $price[$crypto . '/' . $base]['investment'] = $price[$crypto . '/' . $base]['dca'] * $price[$crypto . '/' . $base]['qty'];
         }
 
         return $price;
@@ -216,6 +222,23 @@ public function jsonToTable(array $invests, float $usableBalance): void
     public function render_view(string $view, array $data = []): void
     {
         extract($data);
-        require 'views/'.$view.'.php';
+        require 'views/' . $view . '.php';
+    }
+
+    private function getSequentialOrders($wrx, string $symbol, int $fromOrderID)
+    {
+        $orders = $wrx->getOrders($symbol, ($fromOrderID + 1));
+        if (empty($orders) || (!empty($orders['code']) && ($orders['code'] == 1999))) {
+            return $this->orderArr;
+        }
+
+        $this->orderArr = array_merge($this->orderArr, $orders);
+        if (count($orders) == 1000) {
+            $this->orderArr = array_merge($this->orderArr, $orders);
+            $fromOrderID = $orders[count($orders) - 1]['id'];
+            $this->getSequentialOrders($wrx, $symbol, $fromOrderID);
+        }
+
+        return $this->orderArr;
     }
 }

src/Wrx.php

@@ -50,7 +50,7 @@ final class Wrx
     protected function __construct(string $apiKey = null, string $apiSecret = null)
     {
         CacheManager::setDefaultConfig(new ConfigurationOption([
-                    'path' => __DIR__.DIRECTORY_SEPARATOR.'cache',
+                    'path' => __DIR__ . DIRECTORY_SEPARATOR . 'cache',
                     'defaultChmod' => 0755,
                     'itemDetailedDate' => true,
         ]));
@@ -98,7 +98,7 @@ public static function getInstance(string $apiKey = null, string $apiSecret = nu
      */
     public function getFunds(): array
     {
-        $cacheKey = md5($this->apiKey).'-funds';
+        $cacheKey = md5($this->apiKey) . '-funds';
 
         $this->fields = [
             'timestamp' => round(microtime(true) * 1000),
@@ -108,7 +108,7 @@ public function getFunds(): array
         $this->fields['signature'] = hash_hmac('sha256', http_build_query($this->fields), $this->apiSecret);
 
         $this->headers = [
-            'X-Api-Key: '.$this->apiKey,
+            'X-Api-Key: ' . $this->apiKey,
             'Content-Type: application/x-www-form-urlencoded',
         ];
 
@@ -129,7 +129,7 @@ public function getFunds(): array
      */
     private function removeDust(string $cacheKey): array
     {
-        $cachedStr = $this->cacheAdapter->getItem($cacheKey.'-actual');
+        $cachedStr = $this->cacheAdapter->getItem($cacheKey . '-actual');
 
         if ($cachedStr->isHit()) {
             return $cachedStr->get();
@@ -165,7 +165,7 @@ private function removeDust(string $cacheKey): array
      */
     public function ticker(string $symbol): array
     {
-        $cacheKey = 'ticker-'.$symbol;
+        $cacheKey = 'ticker-' . $symbol;
         $this->fields = [
             'symbol' => $symbol,
         ];
@@ -198,27 +198,30 @@ public function tickers(): array
      * Method to return all the orders of a specific trading pair like BTCINR, BTTCUSDT, etc., from WazirX.
      *
      * @param string $symbol
+     * @param int $orderId
+     *
      * @return array
      * @throws PhpfastcacheInvalidArgumentException
      * @throws PhpfastcacheLogicException
      * @throws \Psr\Cache\InvalidArgumentException
      */
-    public function getOrders(string $symbol): array
+    public function getOrders(string $symbol, int $orderId = 0): array
     {
-        $cacheKey = md5($this->apiKey).'-'.$symbol.'-order';
+        $cacheKey = md5($this->apiKey) . '-' . $symbol . '-order-' . $orderId;
 
         $this->fields = [
             'symbol' => $symbol,
             'timestamp' => round(microtime(true) * 1000),
             'recvWindow' => 60000,
             'limit' => 1000,
+            'orderId' => $orderId,
         ];
         $encodedPayload = hash_hmac('sha256', http_build_query($this->fields), $this->apiSecret);
 
         $this->fields['signature'] = $encodedPayload;
 
         $this->headers = [
-            'X-Api-Key: '.$this->apiKey,
+            'X-Api-Key: ' . $this->apiKey,
             'Content-Type: application/x-www-form-urlencoded',
         ];
 
@@ -247,7 +250,7 @@ private function request(string $path, string $cacheKey, int $duration = 10): ar
         }
         sleep(2);
         $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $this->apiURL.$path);
+        curl_setopt($ch, CURLOPT_URL, $this->apiURL . $path);
         curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'GET');
         curl_setopt($ch, CURLOPT_MAXREDIRS, 10);
         curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);

src/utility.php

@@ -13,7 +13,7 @@ function pr($param = [], $continue = true, string $label = null)
         return null;
     }
     if (!empty($label)) {
-        echo '<p>-- '.$label.' --</p>';
+        echo '<p>-- ' . $label . ' --</p>';
     }
 
     echo '<pre>';
@@ -58,7 +58,7 @@ function getHeaders($respHeaders): array
  */
 function getSiteURL(string $uri = '/'): string
 {
-    return rtrim(BASE_URL, '/').'/'.ltrim($uri, '/');
+    return rtrim(BASE_URL, '/') . '/' . ltrim($uri, '/');
 }
 
 /**
@@ -68,7 +68,7 @@ function getSiteURL(string $uri = '/'): string
  */
 function getAssetURI(string $uri): string
 {
-    return rtrim(getSiteURL(), '/').'/src/views/'.ltrim($uri, '/');
+    return rtrim(getSiteURL(), '/') . '/src/views/' . ltrim($uri, '/');
 }
 
 /**