composer.json

@@ -26,9 +26,9 @@
         "illuminate/contracts": "^10.0||^11.0||^12.0||^13.0"
     },
     "require-dev": {
-        "larastan/larastan": "^3.0",
+        "laravel/pint": "^1.14",
-        "laravel/pint": "^1.29",
         "nunomaduro/collision": "^8.8",
+        "larastan/larastan": "^3.0",
         "orchestra/testbench": "^10.0.0||^9.0.0",
         "pestphp/pest": "^4.0",
         "pestphp/pest-plugin-arch": "^4.0",
@@ -55,8 +55,7 @@
         "analyse": "vendor/bin/phpstan analyse",
         "test": "vendor/bin/pest",
         "test-coverage": "vendor/bin/pest --coverage",
-        "format": "vendor/bin/pint",
+        "format": "vendor/bin/pint"
-        "pint": "vendor/bin/pint --ansi"
     },
     "config": {
         "sort-packages": true,
@@ -75,7 +74,7 @@
             }
         }
     },
-    "version": "1.2.3",
+    "version": "1.2.2",
     "minimum-stability": "stable",
     "prefer-stable": true
 }

src/LaravelBitunixApi.php

@@ -3,14 +3,10 @@
 namespace Msr\LaravelBitunixApi;
 
 use GuzzleHttp\Client;
-use GuzzleHttp\Exception\GuzzleException;
-use Msr\LaravelBitunixApi\Contracts\RateLimiterContract as RateLimiter;
 use Msr\LaravelBitunixApi\Requests\ChangeLeverageRequestContract;
 use Msr\LaravelBitunixApi\Requests\ChangeMarginModeRequestContract;
 use Msr\LaravelBitunixApi\Requests\FlashClosePositionRequestContract;
 use Msr\LaravelBitunixApi\Requests\FutureKLineRequestContract;
-use Msr\LaravelBitunixApi\Requests\GetHistoryPositionsRequestContract;
-use Msr\LaravelBitunixApi\Requests\GetHistoryTradesRequestContract;
 use Msr\LaravelBitunixApi\Requests\GetPendingPositionsRequestContract;
 use Msr\LaravelBitunixApi\Requests\GetSingleAccountRequestContract;
 use Msr\LaravelBitunixApi\Requests\GetTradingPairsRequestContract;
@@ -20,11 +16,11 @@ use Msr\LaravelBitunixApi\Requests\PlacePositionTpSlOrderRequestContract;
 use Msr\LaravelBitunixApi\Requests\PlaceTpSlOrderRequestContract;
 use Psr\Http\Message\ResponseInterface;
 
-class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginModeRequestContract, FlashClosePositionRequestContract, FutureKLineRequestContract, GetHistoryPositionsRequestContract, GetHistoryTradesRequestContract, GetPendingPositionsRequestContract, GetSingleAccountRequestContract, GetTradingPairsRequestContract, PlaceOrderRequestContract, PlacePositionTpSlOrderRequestContract, PlaceTpSlOrderRequestContract
+class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginModeRequestContract, FlashClosePositionRequestContract, FutureKLineRequestContract, GetPendingPositionsRequestContract, GetSingleAccountRequestContract, GetTradingPairsRequestContract, PlaceOrderRequestContract, PlacePositionTpSlOrderRequestContract, PlaceTpSlOrderRequestContract
 {
     private Client $publicFutureClient;
 
-    public function __construct(protected RateLimiter $rateLimiter)
+    public function __construct()
     {
         $this->publicFutureClient = new Client([
             'base_uri' => config('bitunix-api.future_base_uri').'/api/v1/futures/market/',
@@ -42,14 +38,8 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
         ]);
     }
 
-    public function getFutureKline(
+    public function getFutureKline(string $symbol, string $interval, int $limit = 100, ?int $startTime = null, ?int $endTime = null, string $type = 'LAST_PRICE'): ResponseInterface
-        string $symbol,
+    {
-        string $interval,
-        int $limit = 100,
-        ?int $startTime = null,
-        ?int $endTime = null,
-        string $type = 'LAST_PRICE'
-    ): ResponseInterface {
         $response = $this->publicFutureClient->get('kline', [
             'query' => [
                 'symbol' => $symbol,
@@ -198,54 +188,6 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
         return $response;
     }
 
-    public function getHistoryTrades(
-        ?string $symbol = null,
-        ?string $orderId = null,
-        ?string $positionId = null,
-        ?int $startTime = null,
-        ?int $endTime = null,
-        int $skip = 0,
-        int $limit = 100
-    ): ResponseInterface {
-        $this->rateLimiter->throttle(
-            'futures::get_history_trades',
-            $this->resolveRateLimitIdentity(),
-            maxRequests: 8,
-            perSeconds: 1
-        );
-
-        $queryParams = [
-            'skip' => $skip,
-            'limit' => $limit,
-        ];
-
-        if ($symbol !== null) {
-            $queryParams['symbol'] = $symbol;
-        }
-
-        if ($orderId !== null) {
-            $queryParams['orderId'] = $orderId;
-        }
-
-        if ($positionId !== null) {
-            $queryParams['positionId'] = $positionId;
-        }
-
-        if ($startTime !== null) {
-            $queryParams['startTime'] = $startTime;
-        }
-
-        if ($endTime !== null) {
-            $queryParams['endTime'] = $endTime;
-        }
-
-        $response = $this->getPrivateFutureClient($queryParams, [])->get('trade/get_history_trades', [
-            'query' => $queryParams,
-        ]);
-
-        return $response;
-    }
-
     public function getPendingPositions(?string $symbol = null, ?string $positionId = null): ResponseInterface
     {
         $queryParams = [];
@@ -265,45 +207,6 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
         return $response;
     }
 
-    /**
-     * @throws GuzzleException
-     */
-    public function getHistoryPositions(
-        ?string $symbol = null,
-        ?int $startTime = null,
-        ?int $endTime = null,
-        int $skip = 0,
-        int $limit = 100
-    ): ResponseInterface {
-        $this->rateLimiter->throttle(
-            'futures::get_history_positions',
-            $this->resolveRateLimitIdentity(),
-            maxRequests: 8,
-            perSeconds: 1
-        );
-
-        $queryParams = [
-            'skip' => $skip,
-            'limit' => $limit,
-        ];
-
-        if ($symbol !== null) {
-            $queryParams['symbol'] = $symbol;
-        }
-
-        if ($startTime !== null) {
-            $queryParams['startTime'] = $startTime;
-        }
-
-        if ($endTime !== null) {
-            $queryParams['endTime'] = $endTime;
-        }
-
-        return $this->getPrivateFutureClient($queryParams, [])->get('position/get_history_positions', [
-            'query' => $queryParams,
-        ]);
-    }
-
     public function getSingleAccount(string $marginCoin): ResponseInterface
     {
         $queryParams = [
@@ -406,9 +309,4 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
             'json' => $body,
         ]);
     }
-
-    protected function resolveRateLimitIdentity(): string
-    {
-        return (string) config('bitunix-api.api_key');
-    }
 }

src/LaravelBitunixApiServiceProvider.php

@@ -2,15 +2,12 @@
 
 namespace Msr\LaravelBitunixApi;
 
-use Illuminate\Contracts\Cache\Factory as CacheFactory;
 use Msr\LaravelBitunixApi\Commands\LaravelBitunixApiCommand;
 use Msr\LaravelBitunixApi\Contracts\RateLimiterContract;
 use Msr\LaravelBitunixApi\Requests\ChangeLeverageRequestContract;
 use Msr\LaravelBitunixApi\Requests\ChangeMarginModeRequestContract;
 use Msr\LaravelBitunixApi\Requests\FlashClosePositionRequestContract;
 use Msr\LaravelBitunixApi\Requests\FutureKLineRequestContract;
-use Msr\LaravelBitunixApi\Requests\GetHistoryPositionsRequestContract;
-use Msr\LaravelBitunixApi\Requests\GetHistoryTradesRequestContract;
 use Msr\LaravelBitunixApi\Requests\GetPendingPositionsRequestContract;
 use Msr\LaravelBitunixApi\Requests\GetSingleAccountRequestContract;
 use Msr\LaravelBitunixApi\Requests\GetTradingPairsRequestContract;
@@ -20,6 +17,7 @@ use Msr\LaravelBitunixApi\Requests\PlaceTpSlOrderRequestContract;
 use Msr\LaravelBitunixApi\Support\CacheRateLimiter;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
+use Illuminate\Contracts\Cache\Factory as CacheFactory;
 
 class LaravelBitunixApiServiceProvider extends PackageServiceProvider
 {
@@ -52,8 +50,6 @@ class LaravelBitunixApiServiceProvider extends PackageServiceProvider
         $this->app->bind(PlaceTpSlOrderRequestContract::class, LaravelBitunixApi::class);
         $this->app->bind(PlacePositionTpSlOrderRequestContract::class, LaravelBitunixApi::class);
         $this->app->bind(GetTradingPairsRequestContract::class, LaravelBitunixApi::class);
-        $this->app->bind(GetHistoryTradesRequestContract::class, LaravelBitunixApi::class);
-        $this->app->bind(GetHistoryPositionsRequestContract::class, LaravelBitunixApi::class);
 
         $this->app->bind(RateLimiterContract::class, function ($app) {
             return new CacheRateLimiter(

src/Requests/GetHistoryPositionsRequestContract.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace Msr\LaravelBitunixApi\Requests;
-
-use Psr\Http\Message\ResponseInterface;
-
-interface GetHistoryPositionsRequestContract
-{
-    public function getHistoryPositions(
-        ?string $symbol = null,
-        ?int $startTime = null,
-        ?int $endTime = null,
-        int $skip = 0,
-        int $limit = 100
-    ): ResponseInterface;
-}

src/Requests/GetHistoryTradesRequestContract.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Msr\LaravelBitunixApi\Requests;
-
-use Psr\Http\Message\ResponseInterface;
-
-interface GetHistoryTradesRequestContract
-{
-    public function getHistoryTrades(
-        ?string $symbol = null,
-        ?string $orderId = null,
-        ?string $positionId = null,
-        ?int $startTime = null,
-        ?int $endTime = null,
-        int $skip = 0,
-        int $limit = 100
-    ): ResponseInterface;
-}

src/Support/CacheRateLimiter.php

@@ -9,7 +9,8 @@ class CacheRateLimiter implements RateLimiterContract
 {
     public function __construct(
         protected Repository $cache,
-    ) {}
+    ) {
+    }
 
     public function throttle(
         string $bucket,