Merge remote-tracking branch 'origin/master'

.github/workflows/deploy.yml

@@ -0,0 +1,43 @@
+name: Build and deploy
+
+on:
+  push:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate --strict
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v3
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
+      - name: Install dependencies
+        id: build-files
+        run: composer install --prefer-dist --no-progress
+
+      - name: Copy result in server
+        uses: easingthemes/ssh-deploy@main
+        with:
+          SSH_PRIVATE_KEY: ${{ secrets.OCEBOT_PRIVATE_SSH_KEY }}
+          ARGS: "-rlgoDzvc -i --delete"
+          SOURCE: "./"
+          REMOTE_HOST: ${{ secrets.OCEBOT_HOST }}
+          REMOTE_USER: ${{ secrets.OCEBOT_HOST_USER }}
+          TARGET: ${{ secrets.KT_HOST_PATH }}
+          EXCLUDE: "/.git/, /.env.local"
+

app/EventListener/CorsListener.php

@@ -16,10 +16,6 @@ public function __construct(KernelInterface $kernel)
 
     public function onKernelResponse(ResponseEvent $event)
     {
-        if ($this->kernel->getEnvironment() !== 'dev') {
-            return;
-        }
-
         $response = $event->getResponse();
         $response->headers->set('Access-Control-Allow-Origin', '*');
         $response->headers->set('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');

composer.json

@@ -13,6 +13,7 @@
         "doctrine/doctrine-migrations-bundle": "^3.2",
         "doctrine/orm": "^2.12",
         "nelmio/api-doc-bundle": "^4.26",
+        "symfony/apache-pack": "^1.0",
         "symfony/console": "6.4.*",
         "symfony/dotenv": "6.4.*",
         "symfony/flex": "^2",

config/packages/nelmio_api_doc.yaml

@@ -2,10 +2,10 @@ nelmio_api_doc:
   documentation:
     info:
       title: Kujira track API
-      description: Provides useful information and metrics about Kujira network.
-      version: 1.0.0
+      description: Provides useful information and metrics about Kujira network. Alpha version. Expect breaking changes.
+      version: 0.1.0
     servers:
-      - url: http://api.kujira-track.app
+      - url: https://api.kujira-track.app
         description: Main (production) server
     tags: [
       {
@@ -64,4 +64,4 @@ nelmio_api_doc:
       - ^/mint/
       - ^/staking
       - ^/tokens
-      - ^/v2/wallets
+      - ^/v2/wallets

config/services.yaml

@@ -28,10 +28,10 @@ services:
             resource: '../src/'
 
     Ocebot\KujiraTrack\Fin\Domain\FinContractRepository:
-        alias: Ocebot\KujiraTrack\FinContracts\Infrastructure\FinContractRepositoryInMemory
+        alias: Ocebot\KujiraTrack\Fin\Infrastructure\FinContractRepositoryInMemory
 
     Ocebot\KujiraTrack\Fin\Domain\FinCandlesService:
-        alias: Ocebot\KujiraTrack\FinCandles\Infrastructure\FinCandlesServiceLcdCached
+        alias: Ocebot\KujiraTrack\Fin\Infrastructure\FinCandlesServiceLcdCached
 
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones

public/.htaccess

@@ -0,0 +1,70 @@
+# Use the front controller as index file. It serves as a fallback solution when
+# every other rewrite/redirect fails (e.g. in an aliased environment without
+# mod_rewrite). Additionally, this reduces the matching process for the
+# start page (path "/") because otherwise Apache will apply the rewriting rules
+# to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl).
+DirectoryIndex index.php
+
+# By default, Apache does not evaluate symbolic links if you did not enable this
+# feature in your server configuration. Uncomment the following line if you
+# install assets as symlinks or if you experience problems related to symlinks
+# when compiling LESS/Sass/CoffeScript assets.
+# Options +SymLinksIfOwnerMatch
+
+# Disabling MultiViews prevents unwanted negotiation, e.g. "/index" should not resolve
+# to the front controller "/index.php" but be rewritten to "/index.php/index".
+<IfModule mod_negotiation.c>
+    Options -MultiViews
+</IfModule>
+
+<IfModule mod_rewrite.c>
+    # This Option needs to be enabled for RewriteRule, otherwise it will show an error like
+    # 'Options FollowSymLinks or SymLinksIfOwnerMatch is off which implies that RewriteRule directive is forbidden'
+    Options +SymLinksIfOwnerMatch
+
+    RewriteEngine On
+
+    # Determine the RewriteBase automatically and set it as environment variable.
+    # If you are using Apache aliases to do mass virtual hosting or installed the
+    # project in a subdirectory, the base path will be prepended to allow proper
+    # resolution of the index.php file and to redirect to the correct URI. It will
+    # work in environments without path prefix as well, providing a safe, one-size
+    # fits all solution. But as you do not need it in this case, you can comment
+    # the following 2 lines to eliminate the overhead.
+    RewriteCond %{REQUEST_URI}::$0 ^(/.+)/(.*)::\2$
+    RewriteRule .* - [E=BASE:%1]
+
+    # Sets the HTTP_AUTHORIZATION header removed by Apache
+    RewriteCond %{HTTP:Authorization} .+
+    RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0]
+
+    # Redirect to URI without front controller to prevent duplicate content
+    # (with and without `/index.php`). Only do this redirect on the initial
+    # rewrite by Apache and not on subsequent cycles. Otherwise we would get an
+    # endless redirect loop (request -> rewrite to front controller ->
+    # redirect -> request -> ...).
+    # So in case you get a "too many redirects" error or you always get redirected
+    # to the start page because your Apache does not expose the REDIRECT_STATUS
+    # environment variable, you have 2 choices:
+    # - disable this feature by commenting the following 2 lines or
+    # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the
+    #   following RewriteCond (best solution)
+    RewriteCond %{ENV:REDIRECT_STATUS} =""
+    RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L]
+
+    # If the requested filename exists, simply serve it.
+    # We only want to let Apache serve files and not directories.
+    # Rewrite all other queries to the front controller.
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^ %{ENV:BASE}/index.php [L]
+</IfModule>
+
+<IfModule !mod_rewrite.c>
+    <IfModule mod_alias.c>
+        # When mod_rewrite is not available, we instruct a temporary redirect of
+        # the start page to the front controller explicitly so that the website
+        # and the generated links can still be used.
+        RedirectMatch 307 ^/$ /index.php/
+        # RedirectTemp cannot be used instead
+    </IfModule>
+</IfModule>

src/Staking/Domain/StakedKujiCollection.php

@@ -34,9 +34,9 @@ public function diff(): array
             $prev = $value;
         }
 
-        // Remove the last element as it doesn't have a previous value
-        array_pop($stakedKujiDiff);
-
+        // Remove the first element as it doesn't have a previous value
+        array_shift($stakedKujiDiff);
+        
         return array_values($stakedKujiDiff);
     }
 }

symfony.lock

@@ -74,6 +74,18 @@
             "tests/bootstrap.php"
         ]
     },
+    "symfony/apache-pack": {
+        "version": "1.0",
+        "recipe": {
+            "repo": "github.com/symfony/recipes-contrib",
+            "branch": "main",
+            "version": "1.0",
+            "ref": "0f18b4decdf5695d692c1d0dfd65516a07a6adf1"
+        },
+        "files": [
+            "public/.htaccess"
+        ]
+    },
     "symfony/console": {
         "version": "6.1",
         "recipe": {