Use server timestamp

src/Client.php

@@ -40,6 +40,26 @@ public function __construct(
         $this->logger = $logger;
     }
 
+    public function market(): Endpoints\MarketEndpoint
+    {
+        return new Endpoints\MarketEndpoint($this);
+    }
+
+    public function crypto(): Endpoints\CryptoEndpoint
+    {
+        return new Endpoints\CryptoEndpoint($this);
+    }
+
+    public function user(): Endpoints\UserEndpoint
+    {
+        return new Endpoints\UserEndpoint($this);
+    }
+
+    public function system(): Endpoints\SystemEndpoint
+    {
+        return new Endpoints\SystemEndpoint($this);
+    }
+
     public function getTransport(): Transport
     {
         return $this->transport;
@@ -62,19 +82,4 @@ public function sendRequest(PsrRequestInterface $request): PsrResponseInterface
     {
         return $this->transport->sendRequest($request);
     }
-
-    public function market(): Endpoints\MarketEndpoint
-    {
-        return new Endpoints\MarketEndpoint($this);
-    }
-
-    public function system(): Endpoints\SystemEndpoint
-    {
-        return new Endpoints\SystemEndpoint($this);
-    }
-
-    public function user(): Endpoints\UserEndpoint
-    {
-        return new Endpoints\UserEndpoint($this);
-    }
 }

src/Endpoints/CryptoEndpoint.php

@@ -42,7 +42,7 @@ public function addresses(array $params): ResponseInterface
         return $this->makeRequest('GET', '/api/v3/crypto/addresses')
             ->withQuery(array_filter($params))
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->send();
     }
 
@@ -89,7 +89,7 @@ public function withdrawal(array $params): ResponseInterface
 
         return $this->makeRequest('POST', '/api/v3/crypto/withdraw')
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->withBody($params)
             ->send();
     }
@@ -131,7 +131,7 @@ public function internalWithdrawal(array $params): ResponseInterface
 
         return $this->makeRequest('POST', '/api/v3/crypto/internal-withdraw')
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->withBody($params)
             ->send();
     }
@@ -175,7 +175,7 @@ public function depositHistory(array $params): ResponseInterface
         return $this->makeRequest('POST', '/api/v3/crypto/deposit-history')
             ->withQuery(array_filter($params))
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->send();
     }
 
@@ -218,7 +218,7 @@ public function withdrawalHistory(array $params): ResponseInterface
         return $this->makeRequest('POST', '/api/v3/crypto/withdrawal-history')
             ->withQuery(array_filter($params))
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->send();
     }
 
@@ -247,7 +247,7 @@ public function generateAddress(string $symbol): ResponseInterface
         return $this->makeRequest('POST', '/api/v3/crypto/generate-address')
             ->withQuery(['sym' => $symbol])
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->send();
     }
 }

src/Endpoints/MarketEndpoint.php

@@ -232,7 +232,7 @@
 
         return $this->makeRequest('POST', '/api/v3/market/wallet')
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->send();
     }
 
@@ -276,7 +276,7 @@
 
         return $this->makeRequest('POST', '/api/v3/market/place-bid')
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->withBody($params)
             ->send();
     }
@@ -321,7 +321,7 @@
 
         return $this->makeRequest('POST', '/api/v3/market/place-ask')
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->withBody($params)
             ->send();
     }
@@ -353,7 +353,7 @@
         return $this->makeRequest('POST', '/api/v3/market/cancel-order')
             ->acceptJson()
             ->withBody($params)
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->send();
     }
 
@@ -380,7 +380,7 @@
 
         return $this->makeRequest('POST', '/api/v3/market/balances')
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->send();
     }
 
@@ -419,7 +419,7 @@
 
         return $this->makeRequest('GET', '/api/v3/market/my-open-orders')
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->withBody([
                 'sym' => $sym,
             ])
@@ -473,7 +473,7 @@
         return $this->makeRequest('GET', '/api/v3/market/my-order-history')
             ->withQuery(array_filter($params))
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->send();
     }
 
@@ -531,7 +531,7 @@
         return $this->makeRequest('GET', '/api/v3/market/order-info')
             ->withQuery(array_filter($params))
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->send();
     }
 }

src/Endpoints/SystemEndpoint.php

@@ -6,6 +6,23 @@
 
 class SystemEndpoint extends AbstractEndpoint
 {
+    /**
+     * Get server status.
+     *
+     * @response
+     * [
+     *      {
+     *          "name":"Non-secure endpoints",
+     *          "status":"ok",
+     *          "message":""
+     *      },
+     *      {
+     *          "name":"Secure endpoints",
+     *          "status":"ok",
+     *          "message":""
+     *      }
+     * ]
+     */
     public function status(): ResponseInterface
     {
         return $this->makeRequest('GET', '/api/status')->send();
@@ -15,7 +32,7 @@ public function status(): ResponseInterface
      * Get server timestamp.
      *
      * @response
-     * 1701251212273
+     * 1702793384662
      */
     public function serverTimestamp(): ResponseInterface
     {

src/Endpoints/UserEndpoint.php

@@ -22,7 +22,7 @@ public function tradingCredits(): ResponseInterface
 
         return $this->makeRequest('POST', '/api/v3/user/trading-credits')
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->send();
     }
 
@@ -69,7 +69,7 @@ public function userLimits(): ResponseInterface
 
         return $this->makeRequest('POST', '/api/v3/user/limits')
             ->acceptJson()
-            ->withInterceptor(new GenerateSignatureV3($config))
+            ->withInterceptor(new GenerateSignatureV3($config, $this->client))
             ->send();
     }
 }

src/Requests/GenerateSignatureV3.php

@@ -2,7 +2,9 @@
 
 namespace Farzai\Bitkub\Requests;
 
+use Farzai\Bitkub\Client;
 use Farzai\Bitkub\Contracts\RequestInterceptor;
+use Farzai\Bitkub\Utility;
 use Psr\Http\Message\RequestInterface as PsrRequestInterface;
 
 class GenerateSignatureV3 implements RequestInterceptor
@@ -14,25 +16,27 @@ class GenerateSignatureV3 implements RequestInterceptor
      */
     private array $config;
 
-    public function __construct(array $config)
-    {
-        $this->config = $config;
-    }
+    /**
+     * The client instance.
+     */
+    private Client $client;
 
-    public function generate($timestamp, $method, $path, $query, $payload)
+    /**
+     * Create a new client instance.
+     */
+    public function __construct(array $config, Client $client)
     {
-        $message = sprintf('%s%s%s%s%s', $timestamp, $method, $path, $query, $payload);
-        $signature = hash_hmac('sha256', $message, $this->config['secret']);
-
-        return $signature;
+        $this->config = $config;
+        $this->client = $client;
     }
 
     /**
      * Apply the request.
      */
     public function apply(PsrRequestInterface $request): PsrRequestInterface
     {
-        $timestamp = (int) (microtime(true) * 1000);
+        $timestamp = (int) Utility::getServerTimestamp($this->client)->format('U');
+
         $method = strtoupper($request->getMethod());
         $path = '/'.trim($request->getUri()->getPath(), '/');
         $payload = $request->getBody()->getContents() ?: '';
@@ -42,7 +46,7 @@ public function apply(PsrRequestInterface $request): PsrRequestInterface
             $query = '?'.$query;
         }
 
-        $signature = $this->generate($timestamp, $method, $path, $query, $payload);
+        $signature = Utility::generateSignature($this->config['secret'], $timestamp, $method, $path, $query, $payload);
 
         return $request->withHeader('X-BTK-APIKEY', $this->config['api_key'])
             ->withHeader('X-BTK-SIGN', $signature)

src/Requests/PendingRequest.php

@@ -13,20 +13,20 @@
 
 class PendingRequest
 {
-    private ClientInterface $client;
+    public ClientInterface $client;
 
-    private string $method;
+    public string $method;
 
-    private string $path;
+    public string $path;
 
-    private array $options;
+    public array $options;
 
     /**
      * The request interceptors.
      *
      * @var array<\Farzai\Bitkub\Contracts\RequestInterceptor>
      */
-    private $interceptors = [];
+    public $interceptors = [];
 
     /**
      * Create a new pending request instance.
@@ -141,7 +141,7 @@ public function send(): ResponseInterface
     /**
      * Create a new request instance.
      */
-    protected function createRequest(string $method, string $path, array $options = []): PsrRequestInterface
+    public function createRequest(string $method, string $path, array $options = []): PsrRequestInterface
     {
         // Normalize path
         $path = '/'.trim($path, '/');
@@ -170,7 +170,7 @@ protected function createRequest(string $method, string $path, array $options =
     /**
      * Create a new response instance.
      */
-    protected function createResponse(PsrRequestInterface $request, PsrResponseInterface $baseResponse): ResponseInterface
+    public function createResponse(PsrRequestInterface $request, PsrResponseInterface $baseResponse): ResponseInterface
     {
         $response = new Response($request, $baseResponse);
         $response = new ResponseWithValidateErrorCode($response);

src/Utility.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Farzai\Bitkub;
+
+use DateTimeImmutable;
+
+class Utility
+{
+    /**
+     * Generate signature.
+     */
+    public static function generateSignature($secret, $timestamp, $method, $path, $query, $payload)
+    {
+        $message = sprintf('%s%s%s%s%s', $timestamp, $method, $path, $query, $payload);
+        $signature = hash_hmac('sha256', $message, $secret);
+
+        return $signature;
+    }
+
+    /**
+     * Get server timestamp.
+     */
+    public static function getServerTimestamp(Client $client): DateTimeImmutable
+    {
+        $timestamp = (int) $client->system()
+            ->serverTimestamp()
+            ->throw()->body();
+
+        return \DateTimeImmutable::createFromFormat('U', $timestamp);
+    }
+}

tests/AuthorizerTest.php

@@ -1,22 +1,30 @@
 <?php
 
-use Farzai\Bitkub\Requests\GenerateSignatureV3;
+use Farzai\Bitkub\ClientBuilder;
+use Farzai\Bitkub\Tests\MockHttpClient;
+use Farzai\Bitkub\Utility;
 
 it('can generate signature success', function () {
-    $secret = 'test-secret';
+    $secret = 'secret';
     $timestamp = 1630483200000;
-
     $method = 'POST';
     $path = '/api/v3/market/balances';
     $query = '';
     $payload = '';
 
-    $authorizer = new GenerateSignatureV3([
-        'api_key' => 'test',
-        'secret' => $secret,
-    ]);
+    $psrClient = MockHttpClient::make()
+        ->addSequence(fn ($client) => $client->createResponse(200, (string) $timestamp));
+
+    $client = ClientBuilder::create()
+        ->setCredentials('test', 'secret')
+        ->setHttpClient($psrClient)
+        ->build();
+
+    $timestamp = (int) Utility::getServerTimestamp($client)->format('U');
+
+    expect($timestamp)->toBe(1630483200000);
 
-    $signature = $authorizer->generate($timestamp, $method, $path, $query, $payload);
+    $signature = Utility::generateSignature($secret, $timestamp, $method, $path, $query, $payload);
 
-    expect($signature)->toBe('b8403c345ce41b25b47885254fb8aeed9ad7ceb9e30425b86a9a151dd6ac2e35');
+    expect($signature)->toBe('ae6fd3dc7d85ebea023e54292fa6eebaeea6dc02002433c51b57136eeb0a03e5');
 });