Merge branch 'andrius/switch-pnpm' into 'main'

chore: switch from yarn to pnpm, update Node to lts/24

See merge request flarenetwork/ftso/ftso-scaling!172

Author: adg-flare

.dockerignore

@@ -6,4 +6,4 @@
 !package.json
 !tsconfig.build.json
 !tsconfig.json
-!yarn.lock
+!pnpm-lock.yaml

.gitlab-ci.yml

@@ -4,25 +4,31 @@ workflow:
       when: never
     - when: always
 
-lint:
-  stage: test
-  image: node:22
+.node_pnpm_job:
+  image: node:24
   cache:
     - key:
         files:
-          - yarn.lock
+          - pnpm-lock.yaml
       paths:
         - node_modules
-        - .yarn-cache
+        - .pnpm-store
       policy: pull-push
   before_script:
-    - yarn install --frozen-lockfile --cache-folder .yarn-cache
+    - corepack enable
+    - corepack prepare "$(node -p "require('./package.json').packageManager")" --activate
+    - pnpm config set store-dir .pnpm-store
+    - pnpm install --frozen-lockfile
+
+lint:
+  extends: .node_pnpm_job
+  stage: test
   script:
     - |
       set +e  # don't stop on first failure
-      yarn lint:check
+      pnpm lint:check
       LINT_EXIT=$?
-      yarn format:check
+      pnpm format:check
       FORMAT_EXIT=$?
       set -e
 
@@ -32,24 +38,14 @@ lint:
       fi
 
 test-all:
+  extends: .node_pnpm_job
   stage: test
   needs: []
-  image: node:22
-  cache:
-    - key:
-        files:
-          - yarn.lock
-      paths:
-        - node_modules
-        - .yarn-cache
-      policy: pull-push
-  before_script:
-    - yarn install --frozen-lockfile --cache-folder .yarn-cache
   script:
-    - yarn test:all
+    - pnpm test:all
 
 # TODO: enable coverage reports
 # test-coverage:
 #   extends: test-all
 #   script:
-#     - yarn test:coverage
+#     - pnpm test:coverage

.nvmrc

@@ -1 +1 @@
-v22.16
+v24.13.1

.vscode/launch.json

@@ -12,7 +12,7 @@
       "program": "${file}",
       // "preLaunchTask": "tsc: build - tsconfig.json",
       "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-      "runtimeExecutable": "yarn",
+      "runtimeExecutable": "pnpm",
       "runtimeArgs": ["start:debug"]
     },
 
@@ -28,21 +28,21 @@
       "type": "node",
       "request": "launch",
       "name": "Test FTSO reward logic",
-      "runtimeExecutable": "yarn",
+      "runtimeExecutable": "pnpm",
       "runtimeArgs": ["test", "test/libs/unit/generator-rewards.test.ts"]
     },
     {
       "type": "node",
       "request": "launch",
       "name": "Test Integration",
-      "runtimeExecutable": "yarn",
+      "runtimeExecutable": "pnpm",
       "runtimeArgs": ["test:integration"]
     },
     {
       "type": "node",
       "request": "launch",
       "name": "Test basic generation",
-      "runtimeExecutable": "yarn",
+      "runtimeExecutable": "pnpm",
       "env": {
         "NETWORK": "local-test"
       },
@@ -52,7 +52,7 @@
       "type": "node",
       "request": "launch",
       "name": "Calculation process",
-      "runtimeExecutable": "yarn",
+      "runtimeExecutable": "pnpm",
       "env": {
         "NETWORK": "from-env",
         "FTSO_CA_FTSO_SYSTEMS_MANAGER_ADDRESS": "0xa4bcDF64Cdd5451b6ac3743B414124A6299B65FF",

CHANGELOG.md

@@ -13,8 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- ...
-
+- Switched from Yarn to pnpm package manager
+- Updated Dockerfile to only include `ftso-data-provider` and start it automatically. 
+No need to pass an extra command to the container anymore.
 
 ## [1.0.5] - 2026-02-19
 

CONTRIBUTING.md

@@ -29,13 +29,13 @@ also welcome.
 Prerequisites:
 
 - Node.js, as specified in the `.nvmrc` file. We recommend using `nvm` to manage versions.
-- Yarn 1.22.x
+- pnpm 10.28.x
 - Git
 
 Install the dependencies:
 
 ```bash
-$ yarn install
+$ pnpm install
 ```
 
 ### Configuration
@@ -49,42 +49,42 @@ To start the app run:
 
 ```bash
 # development
-$ yarn run start
+$ pnpm run start
 
 # watch mode
-$ yarn run start:dev
+$ pnpm run start:dev
 ```
 
 ### Testing
 
 To run all tests or check code coverage, use the following commands:
 ```bash
-yarn test:all
-yarn test:coverage
+pnpm test:all
+pnpm test:coverage
 ```
 ### Linting and formatting
 
 We use ESLint and Prettier:
 - Check lint:
 
   ```bash
-  yarn lint:check
+  pnpm lint:check
   ```
 
 - Auto-fix lint issues:
 
   ```bash
-  yarn lint:fix
+  pnpm lint:fix
   ```
 
 - Check formatting:
 
   ```bash
-  yarn format:check
+  pnpm format:check
   ```
 
 - Auto-format:
 
   ```bash
-  yarn format:fix
-  ```
+  pnpm format:fix
+  ```

Dockerfile

@@ -1,21 +1,24 @@
-FROM node:22-slim@sha256:4a4884e8a44826194dff92ba316264f392056cbe243dcc9fd3551e71cea02b90 AS nodemodules
+FROM node:24-slim@sha256:bf22df20270b654c4e9da59d8d4a3516cce6ba2852e159b27288d645b7a7eedc AS base
 
 WORKDIR /app
 
-COPY package.json yarn.lock ./
-RUN yarn install --frozen-lockfile --network-timeout 100000
+RUN corepack enable
+COPY package.json pnpm-lock.yaml ./
 
-FROM node:22-slim@sha256:4a4884e8a44826194dff92ba316264f392056cbe243dcc9fd3551e71cea02b90 AS build
+FROM base AS nodemodules
+RUN corepack prepare "$(node -p "require('./package.json').packageManager")" --activate && \
+    pnpm install --frozen-lockfile --ignore-scripts
+
+FROM base AS build
 
 WORKDIR /app
 
 COPY --from=nodemodules /app/node_modules /app/node_modules
 COPY . ./
 
-RUN yarn build
-RUN yarn build ftso-reward-calculation-process
+RUN pnpm exec nest build ftso-data-provider
 
-FROM node:22-slim@sha256:4a4884e8a44826194dff92ba316264f392056cbe243dcc9fd3551e71cea02b90 AS runtime
+FROM node:24-slim@sha256:bf22df20270b654c4e9da59d8d4a3516cce6ba2852e159b27288d645b7a7eedc AS runtime
 
 WORKDIR /app
 
@@ -24,5 +27,4 @@ COPY --from=build /app/dist /app/dist
 
 COPY . .
 
-CMD ["bash"]
-
+CMD ["node", "dist/apps/ftso-data-provider/src/main.js"]

apps/ftso-data-provider/tsconfig.app.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "declaration": false,
-    "outDir": "../../dist/apps/ftso-data-provider"
+    "outDir": "../../dist"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist", "test", "**/*spec.ts", "old"]

apps/ftso-reward-calculation-process/src/ftso-reward-calculation-process.module.ts

@@ -18,11 +18,11 @@ const IMPORTS_ARRAY = [
       const sqliteDatabase: string = configService.get("db_sqlite3_path");
       if (sqliteDatabase) {
         return {
-          type: "sqlite",
+          type: "better-sqlite3",
           database: sqliteDatabase,
           entities: [TLPTransaction, TLPEvents, TLPState],
           synchronize: false,
-          flags: 1,
+          readonly: true,
           // logging: true,
         };
       }

apps/ftso-reward-calculation-process/tsconfig.app.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "declaration": false,
-    "outDir": "../../dist/apps/ftso-reward-calculation-process"
+    "outDir": "../../dist"
   },
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist", "test", "**/*spec.ts"]