.github/workflows/dependabot-auto-merge.yml

@@ -14,7 +14,7 @@ jobs:
 
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v2.5.0
+        uses: dependabot/fetch-metadata@v2.4.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.github/workflows/fix-php-code-style-issues.yml

@@ -23,6 +23,6 @@ jobs:
         uses: aglipanci/laravel-pint-action@2.6
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v7
+        uses: stefanzweifel/git-auto-commit-action@v6
         with:
           commit_message: Fix styling

.github/workflows/run-tests.yml

@@ -2,9 +2,12 @@ name: run-tests
 
 on:
   push:
-    branches: [main, dev]
+    paths:
-  pull_request:
+      - '**.php'
-    branches: [main]
+      - '.github/workflows/run-tests.yml'
+      - 'phpunit.xml.dist'
+      - 'composer.json'
+      - 'composer.lock'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -12,20 +15,19 @@ concurrency:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     timeout-minutes: 5
     strategy:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        php: [8.4]
+        php: [8.4, 8.3]
         laravel: [12.*, 11.*]
         stability: [prefer-stable]
         include:
           - laravel: 12.*
-            testbench: 10.*
           - laravel: 11.*
-            testbench: 9.*
+          - laravel: 10.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

README.md

@@ -2,19 +2,10 @@
 
 A Laravel package for interacting with the Bitunix cryptocurrency exchange API.
 
----
-
-[![Latest Stable Version](https://poser.pugx.org/mahdimsr/laravel-bitunix-api/v/stable)](https://packagist.org/packages/msr/laravel-bitunix-api)
-[![Fix PHP code style issues](https://github.com/mahdimsr/laravel-bitunix-api/actions/workflows/fix-php-code-style-issues.yml/badge.svg)](https://github.com/mahdimsr/laravel-bitunix-api/actions/workflows/fix-php-code-style-issues.yml)
-[![PHPStan](https://github.com/mahdimsr/laravel-bitunix-api/actions/workflows/phpstan.yml/badge.svg)](https://github.com/mahdimsr/laravel-bitunix-api/actions/workflows/phpstan.yml)
-[![run-tests](https://github.com/mahdimsr/laravel-bitunix-api/actions/workflows/run-tests.yml/badge.svg)](https://github.com/mahdimsr/laravel-bitunix-api/actions/workflows/run-tests.yml)
-[![License](https://poser.pugx.org/mahdimsr/laravel-bitunix-api/license)](https://packagist.org/packages/msr/laravel-bitunix-api)
-
-
 ## Installation
 
 ```bash
-composer require mahdimsr/laravel-bitunix-api
+composer require msr/laravel-bitunix-api
 ```
 
 ## Configuration

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "moltox/laravel-bitunix-api",
+    "name": "mahdimsr/laravel-bitunix-api",
     "description": "composer package for using bitunix api trading",
     "keywords": [
         "msr",
@@ -13,22 +13,17 @@
             "name": "mahdi mansouri",
             "email": "mahdi.msr4@gmail.com",
             "role": "Developer"
-        },
-        {
-            "name": "Maik Mueller   ",
-            "email": "mueller.maik1@gmail.com",
-            "role": "Developer"
         }
     ],
     "require": {
         "php": "^8.4",
         "spatie/laravel-package-tools": "^1.16",
-        "illuminate/contracts": "^10.0||^11.0||^12.0||^13.0"
+        "illuminate/contracts": "^11.0||^12.0||^10.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 +50,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 +69,7 @@
             }
         }
     },
-    "version": "1.2.3",
+    "version": "1.0.0",
     "minimum-stability": "stable",
     "prefer-stable": true
 }

src/Contracts/RateLimiterContract.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace Msr\LaravelBitunixApi\Contracts;
-
-interface RateLimiterContract
-{
-    public function throttle(
-        string $bucket,
-        string $identity,
-        int $maxRequests,
-        float $perSeconds
-    ): void;
-}

src/LaravelBitunixApi.php

@@ -3,28 +3,23 @@
 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;
 use Msr\LaravelBitunixApi\Requests\Header;
 use Msr\LaravelBitunixApi\Requests\PlaceOrderRequestContract;
 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, 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 +37,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,
@@ -64,21 +53,6 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
         return $response;
     }
 
-    public function getTradingPairs(?string $symbols = null): ResponseInterface
-    {
-        $queryParams = [];
-
-        if ($symbols !== null) {
-            $queryParams['symbols'] = $symbols;
-        }
-
-        $response = $this->publicFutureClient->get('trading_pairs', [
-            'query' => $queryParams,
-        ]);
-
-        return $response;
-    }
-
     public function changeLeverage(string $symbol, string $marginCoin, int $leverage): ResponseInterface
     {
         $body = [
@@ -198,54 +172,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 +191,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 = [
@@ -402,13 +289,10 @@ class LaravelBitunixApi implements ChangeLeverageRequestContract, ChangeMarginMo
             $body['slStopType'] = $slStopType;
         }
 
-        return $this->getPrivateFutureClient([], $body)->post('tpsl/position/place_order', [
+        $response = $this->getPrivateFutureClient([], $body)->post('tpsl/position/place_order', [
             'json' => $body,
         ]);
-    }
 
-    protected function resolveRateLimitIdentity(): string
+        return $response;
-    {
-        return (string) config('bitunix-api.api_key');
     }
 }

src/LaravelBitunixApiServiceProvider.php

@@ -2,22 +2,16 @@
 
 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;
 use Msr\LaravelBitunixApi\Requests\PlaceOrderRequestContract;
 use Msr\LaravelBitunixApi\Requests\PlacePositionTpSlOrderRequestContract;
 use Msr\LaravelBitunixApi\Requests\PlaceTpSlOrderRequestContract;
-use Msr\LaravelBitunixApi\Support\CacheRateLimiter;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
 
@@ -51,14 +45,5 @@ class LaravelBitunixApiServiceProvider extends PackageServiceProvider
         $this->app->bind(GetSingleAccountRequestContract::class, LaravelBitunixApi::class);
         $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(
-                $app->make(CacheFactory::class)->store()
-            );
-        });
     }
 }

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/Requests/GetTradingPairsRequestContract.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace Msr\LaravelBitunixApi\Requests;
-
-use Psr\Http\Message\ResponseInterface;
-
-interface GetTradingPairsRequestContract
-{
-    /**
-     * Get future trading pair details
-     *
-     * @param  string|null  $symbols  Trading pairs, comma-separated (e.g., "BTCUSDT,ETHUSDT,XRPUSDT")
-     */
-    public function getTradingPairs(?string $symbols = null): ResponseInterface;
-}

src/Support/CacheRateLimiter.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace Msr\LaravelBitunixApi\Support;
-
-use Illuminate\Contracts\Cache\Repository;
-use Msr\LaravelBitunixApi\Contracts\RateLimiterContract;
-
-class CacheRateLimiter implements RateLimiterContract
-{
-    public function __construct(
-        protected Repository $cache,
-    ) {}
-
-    public function throttle(
-        string $bucket,
-        string $identity,
-        int $maxRequests,
-        float $perSeconds
-    ): void {
-        if ($maxRequests <= 0 || $perSeconds <= 0) {
-            return;
-        }
-
-        $cacheKey = $this->makeCacheKey($bucket, $identity);
-        $minIntervalMicroseconds = (int) (($perSeconds / $maxRequests) * 1_000_000);
-
-        $lastRequestAt = $this->cache->get($cacheKey);
-
-        if (is_numeric($lastRequestAt)) {
-            $elapsedMicroseconds = (int) ((microtime(true) - (float) $lastRequestAt) * 1_000_000);
-
-            if ($elapsedMicroseconds < $minIntervalMicroseconds) {
-                $sleepMicroseconds = $minIntervalMicroseconds - $elapsedMicroseconds;
-
-                if ($sleepMicroseconds > 0) {
-                    usleep($sleepMicroseconds);
-                }
-            }
-        }
-
-        $this->cache->put(
-            $cacheKey,
-            microtime(true),
-            now()->addSeconds((int) max(1, ceil($perSeconds * 2)))
-        );
-    }
-
-    protected function makeCacheKey(string $bucket, string $identity): string
-    {
-        return sprintf(
-            'laravel_bitunix_api:rate_limit:%s:%s',
-            $bucket,
-            sha1($identity)
-        );
-    }
-}

tests/GetTradingPairsTest.php

@@ -1,108 +0,0 @@
-<?php
-
-use Msr\LaravelBitunixApi\Requests\GetTradingPairsRequestContract;
-
-beforeEach(function () {
-    config([
-        'bitunix-api.future_base_uri' => 'https://fapi.bitunix.com/',
-        'bitunix-api.api_key' => 'test-api-key',
-        'bitunix-api.api_secret' => 'test-secret-key',
-        'bitunix-api.language' => 'en-US',
-    ]);
-});
-
-it('check trading pairs request response code', function () {
-    $bootedClass = app(GetTradingPairsRequestContract::class);
-    $response = $bootedClass->getTradingPairs();
-    expect($response->getStatusCode())
-        ->toBe(200)
-        ->and(json_decode($response->getBody()->getContents(), true))
-        ->toHaveKeys(['code', 'data', 'msg']);
-});
-
-it('can get trading pairs with specific symbols', function () {
-    $api = app(GetTradingPairsRequestContract::class);
-
-    expect(fn () => $api->getTradingPairs('BTCUSDT,ETHUSDT'))
-        ->not->toThrow(Exception::class);
-});
-
-it('can get trading pairs without symbols parameter', function () {
-    $api = app(GetTradingPairsRequestContract::class);
-
-    expect(fn () => $api->getTradingPairs())
-        ->not->toThrow(Exception::class);
-});
-
-it('validates get trading pairs method exists', function () {
-    $api = app(GetTradingPairsRequestContract::class);
-
-    expect(method_exists($api, 'getTradingPairs'))->toBeTrue();
-});
-
-it('can handle single symbol', function () {
-    $api = app(GetTradingPairsRequestContract::class);
-
-    expect(fn () => $api->getTradingPairs('BTCUSDT'))
-        ->not->toThrow(Exception::class);
-});
-
-it('can handle multiple symbols', function () {
-    $api = app(GetTradingPairsRequestContract::class);
-
-    $symbols = 'BTCUSDT,ETHUSDT,XRPUSDT';
-    expect(fn () => $api->getTradingPairs($symbols))
-        ->not->toThrow(Exception::class);
-});
-
-it('validates trading pairs response structure', function () {
-    $api = app(GetTradingPairsRequestContract::class);
-
-    $response = $api->getTradingPairs();
-    $data = json_decode($response->getBody()->getContents(), true);
-
-    expect($response->getStatusCode())->toBe(200)
-        ->and($data)->toHaveKeys(['code', 'data', 'msg']);
-
-    if (isset($data['data']) && is_array($data['data']) && count($data['data']) > 0) {
-        $firstPair = $data['data'][0];
-        expect($firstPair)->toHaveKeys([
-            'symbol',
-            'base',
-            'quote',
-            'minTradeVolume',
-            'minBuyPriceOffset',
-            'maxSellPriceOffset',
-            'maxLimitOrderVolume',
-            'maxMarketOrderVolume',
-            'basePrecision',
-            'quotePrecision',
-            'maxLeverage',
-            'minLeverage',
-            'defaultLeverage',
-            'defaultMarginMode',
-            'priceProtectScope',
-            'symbolStatus',
-        ]);
-    }
-});
-
-it('can handle different symbol formats', function () {
-    $api = app(GetTradingPairsRequestContract::class);
-
-    // Test with uppercase symbols
-    expect(fn () => $api->getTradingPairs('BTCUSDT'))
-        ->not->toThrow(Exception::class);
-
-    // Test with lowercase symbols
-    expect(fn () => $api->getTradingPairs('btcusdt'))
-        ->not->toThrow(Exception::class);
-});
-
-it('can handle empty symbols parameter', function () {
-    $api = app(GetTradingPairsRequestContract::class);
-
-    // Test with null (should return all trading pairs)
-    expect(fn () => $api->getTradingPairs(null))
-        ->not->toThrow(Exception::class);
-});