Merge branch 'main' into fix-all-dht-and-trackerless-hanging-tests

.eslintrc.js

@@ -2,8 +2,15 @@ module.exports = {
     extends: [
         "eslint:recommended",
         "plugin:@typescript-eslint/eslint-recommended",
+        'plugin:@typescript-eslint/recommended-requiring-type-checking',
         'eslint-config-streamr-ts'
     ],
+    parser: '@typescript-eslint/parser',
+    parserOptions: {
+        project: ['./tsconfig.jest.json'],
+        tsconfigRootDir: __dirname,
+    },
+    root: true,
     env: {
         node: true
     },
@@ -62,6 +69,24 @@ module.exports = {
         'promise/no-promise-in-callback': ['error'],
         //'@typescript-eslint/no-empty-function': 'error',
         'no-multi-spaces': ["error", { ignoreEOLComments: true }],
-        'default-case': ['error']
+        'default-case': ['error'],
+        // TODO: in follow up PRs, select which rules we should enable and fix the code. When all recommended rules
+        //  have been enabled, consider enabling the "strict" preset.
+        '@typescript-eslint/require-await': 'off',
+        '@typescript-eslint/no-floating-promises': 'off',
+        '@typescript-eslint/await-thenable': 'off',
+        '@typescript-eslint/no-misused-promises': 'off',
+        '@typescript-eslint/no-unsafe-return': 'off',
+        '@typescript-eslint/no-unsafe-argument': 'off',
+        '@typescript-eslint/no-unsafe-assignment': 'off',
+        '@typescript-eslint/no-unsafe-member-access': 'off',
+        '@typescript-eslint/no-unsafe-call': 'off',
+        '@typescript-eslint/no-unnecessary-type-assertion': 'off',
+        '@typescript-eslint/restrict-template-expressions': 'off',
+        '@typescript-eslint/restrict-plus-operands': 'off',
+        '@typescript-eslint/unbound-method': 'off',
+        '@typescript-eslint/no-base-to-string': 'off',
+        '@typescript-eslint/no-unsafe-enum-comparison': 'off',
+        '@typescript-eslint/no-redundant-type-constituents': 'off'
     }
 }

.github/labeler.yml

@@ -1,41 +1,52 @@
 ---
-test:
-  - '*test*'
 ci:
-  - '.github/*'
-  - '.github/**/*'
+- changed-files:
+  - any-glob-to-any-file: '.github/*'
+  - any-glob-to-any-file: '.github/**/*'
 docs:
-  - '**.md'
-  - '*.md'
+- changed-files:
+  - any-glob-to-any-file: '**.md'
+  - any-glob-to-any-file: '*.md'
 broker:
-  - 'packages/broker/*'
-  - 'packages/broker/**/*'
+- changed-files:
+  - any-glob-to-any-file: 'packages/broker/*'
+  - any-glob-to-any-file: 'packages/broker/**/*'
 browser-test-runner:
-  - 'package/browser-test-runner/*'
-  - 'package/browser-test-runner/**/*'
+- changed-files:
+  - any-glob-to-any-file: 'package/browser-test-runner/*'
+  - any-glob-to-any-file: 'package/browser-test-runner/**/*'
 network:
-  - 'packages/trackerless-network/*'
-  - 'packages/trackerless-network/**/*'
+- changed-files:
+  - any-glob-to-any-file: 'packages/trackerless-network/*'
+  - any-glob-to-any-file: 'packages/trackerless-network/**/*'
 dht:
-  - 'packages/dht/*'
-  - 'packages/dht/**/*'
+- changed-files:
+  - any-glob-to-any-file: 'packages/dht/*'
+  - any-glob-to-any-file: 'packages/dht/**/*'
 proto-rpc:
-  - 'packages/proto-rpc/*'
-  - 'packages/proto-rpc/**/*'
+- changed-files:
+  - any-glob-to-any-file: 'packages/proto-rpc/*'
+  - any-glob-to-any-file: 'packages/proto-rpc/**/*'
 client:
-  - 'packages/client/*'
-  - 'packages/client/**/*'
+- changed-files:
+  - any-glob-to-any-file: 'packages/client/*'
+  - any-glob-to-any-file: 'packages/client/**/*'
 protocol:
-  - 'packages/protocol/*'
-  - 'packages/protocol/**/*'
+- changed-files:
+  - any-glob-to-any-file: 'packages/protocol/*'
+  - any-glob-to-any-file: 'packages/protocol/**/*'
 test-utils:
-  - 'packages/test-utils/*'
-  - 'packages/test-utils/**/*'
+- changed-files:
+  - any-glob-to-any-file: 'packages/test-utils/*'
+  - any-glob-to-any-file: 'packages/test-utils/**/*'
 utils:
-  - 'packages/utils/*'
-  - 'packages/utils/**/*'
+- changed-files:
+  - any-glob-to-any-file: 'packages/utils/*'
+  - any-glob-to-any-file: 'packages/utils/**/*'
 cli-tools:
-  - 'packages/cli-tools/*'
-  - 'packages/cli-tools/**/*'
+- changed-files:
+  - any-glob-to-any-file: 'packages/cli-tools/*'
+  - any-glob-to-any-file: 'packages/cli-tools/**/*'
 changelog:
-  - 'packages/*/CHANGELOG.md'
+- changed-files:
+  - any-glob-to-any-file: 'packages/*/CHANGELOG.md'

.github/workflows/deploy-docs.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: npm

.github/workflows/docker-build.yml

@@ -70,24 +70,22 @@ jobs:
 
       - name: Docker meta
         id: docker_meta_success
-        uses: docker/metadata-action@v5.3.0
+        uses: docker/metadata-action@v5.5.0
         if: ${{inputs.push_image}}
         with:
           images: ${{inputs.image_name}}
           flavor: |
             latest=false
           tags: |
             type=match,pattern=broker/(v.*),group=1,value=${{ env.broker_head_tag }}
-            type=raw,value=dev,enable=${{ inputs.branch == 'main' }}
-            type=raw,value=dev-tatum,enable=${{ inputs.branch == 'streamr-1.0' }}
-            type=raw,value=pretestnet,enable=${{ inputs.branch == 'pretestnet' }}
-            type=raw,value=testnet-one,enable=${{ inputs.branch == 'testnet-one' }}
+            type=raw,value=dev,enable=${{ inputs.branch == 'brubeck' }}
+            type=raw,value=dev-tatum,enable=${{ inputs.branch == 'main' }}
             type=raw,value=testnet-two,enable=${{ inputs.branch == 'testnet-two' }}
             type=raw,value=testnet-three,enable=${{ inputs.branch == 'testnet-three' }}
 
       - name: Build
         if: ${{!inputs.push_image}}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ${{inputs.docker_file}}
@@ -112,7 +110,7 @@ jobs:
 
       - name: Build & Push
         if: ${{inputs.push_image}}
-        uses: docker/build-push-action@v5.0.0
+        uses: docker/build-push-action@v5.1.0
         with:
           context: .
           file: ${{inputs.docker_file}}
@@ -134,7 +132,7 @@ jobs:
 
       - name: Upload logs to GitHub
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker-logs-node${{ matrix.node-version }}--${{ github.run_id }}-${{ github.run_number }}-${{ github.run_attempt}}
           path: 'logs'

.github/workflows/label.yml

@@ -14,7 +14,7 @@ jobs:
     name: Label
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/labeler@v4
+      - uses: actions/labeler@v5
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true

.github/workflows/release.yml

@@ -1,12 +1,24 @@
 name: release
 on:
   workflow_run:
-    branches: [main, streamr-1.0, pretestnet, testnet-one, testnet-two, testnet-three]
+    branches: [main, brubeck, testnet-two, testnet-three]
     workflows: [validate]
     types:
       - completed
   workflow_dispatch:
 jobs:
+  tracker-docker-image:
+    if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.head_branch == 'refs/heads/brubeck' }}
+    uses: ./.github/workflows/docker-build.yml
+    with:
+      docker_file: Dockerfile.tracker
+      image_name: streamr/tracker
+      build_platforms: linux/amd64
+      branch: ${{ github.event.workflow_run.head_branch }}
+      push_image: true
+    secrets:
+      dockerhub_username: ${{secrets.DOCKERHUB_USERNAME}}
+      dockerhub_token: ${{secrets.DOCKERHUB_TOKEN}}
   broker-docker-image:
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/docker-build.yml

.github/workflows/staging-docs.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: npm

.github/workflows/test-docs.yml

@@ -2,7 +2,7 @@ name: Test Building Documentation
 
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ main, brubeck ]
 
 jobs:  
   deploy:
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
           cache: npm

.github/workflows/test-setup.yml

@@ -29,6 +29,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: build (cached)
         uses: ./.github/workflows/reusable/cached-build
+      - run: npm run check
+        working-directory: 'packages/${{ inputs.package }}'
       - name: start docker services
         if: ${{ inputs.docker-services != '' }}
         uses: streamr-dev/streamr-docker-dev-action@v1.0.1

.github/workflows/validate.yml

@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - brubeck
   pull_request:
     branches:
       - '*'
@@ -20,9 +21,15 @@ jobs:
       - uses: actions/checkout@v4
       - name: build
         uses: ./.github/workflows/reusable/cached-build
-      - run: npm run versions
-      - run: npm run check
+  lint:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: build (cached)
+        uses: ./.github/workflows/reusable/cached-build
       - run: npm run eslint
+      - run: npm run versions
   test-utils:
     needs: build
     uses: ./.github/workflows/test-setup.yml

.nvmrc

@@ -1 +1 @@
-18.16.0
+20.10.0

Dockerfile.broker

@@ -1,4 +1,4 @@
-FROM node:18-bullseye as build
+FROM node:20-bullseye as build
 WORKDIR /usr/src/network
 COPY . .
 RUN --mount=type=cache,target=/root/.npm \

internal-docs/index.md → developer-docs/index.md

@@ -1,4 +1,14 @@
-# Streamr Network Technical Documentation
+# Streamr Network Developer Documentation
+
+## Conventions
+
+### Counts 
+
+- Functions and methods for getting counts should be named `getFooCount`
+- Variables and fields which store counts should be named `fooCount`
+
+Examples:
+- `getConnectionCount`, `neighborCount`
 
 ## Topics
 - [Testing Best Practices](testing-best-practices.md)