generating dappnode package with renamed folders

.github/workflows/main.yml

@@ -10,7 +10,17 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Set up Docker Compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
+
       - name: Build and upload to IPFS
         run: |
           npm install

.github/workflows/release.yml

@@ -9,8 +9,19 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Set up Docker Compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
+
       - name: Build and publish to package repository
+        id: publish
         run: |
           npm install
           npx @dappnode/dappnodesdk publish patch \
@@ -21,6 +32,22 @@ jobs:
 
           echo "DNP (DAppNode Package) built and uploaded" >> $GITHUB_STEP_SUMMARY
           grep "ipfs" build.log >> $GITHUB_STEP_SUMMARY
+          ipfs_hash=$(grep -oP 'Release hash : \K/ipfs/\w+' build.log)
+          echo "ipfs_hash=$ipfs_hash" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DEVELOPER_ADDRESS: "0x7305356ad936A06c4ea5DF45AD5E5C3ff9Db818E"
+
+      - name: Send message to Zulip
+        uses: zulip/github-actions-zulip/send-message@v1
+        with:
+          api-key: ${{ secrets.ZULIP_API_KEY }}
+          email: ${{ secrets.ZULIP_EMAIL }}
+          organization-url: "https://hopr.zulipchat.com"
+          type: "stream"
+          to: "Releases"
+          topic: "main"
+          content: |
+            A new hoprd dAppNode package (dufour) version is available.
+            - IPFS Hash: ${{ steps.publish.outputs.ipfs_hash }}
+            Access to your dAppNode and check for the updates

Dockerfile

@@ -4,6 +4,9 @@ FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hoprd:${UPSTREAM_
 # not used at the moment, but might be useful in the future
 ENV DAPPNODE=true
 
-ADD hoprd.cfg.yaml /app/hoprd.cfg.yaml
+ADD hoprd.cfg.yaml /app/hoprd/conf/hoprd.cfg.yaml
+ADD entrypoint.sh /bin/entrypoint.sh
 
-ENTRYPOINT ["/bin/hoprd", "--configurationFilePath", "/app/hoprd.cfg.yaml"]
+RUN chmod +rx /bin/entrypoint.sh
+
+ENTRYPOINT ["/bin/entrypoint.sh"]

dappnode_package.json

@@ -1,7 +1,7 @@
 {
   "name": "hopr.public.dappnode.eth",
   "version": "1.0.19",
-  "upstreamVersion": "saint-louis",
+  "upstreamVersion": "singapore",
   "description": "The HOPR protocol ensures everyone has control of their privacy, data, and identity. By running a HOPR Node, you can obtain HOPR tokens by relaying data and connect to the HOPR Network.",
   "type": "service",
   "architectures": [
@@ -20,8 +20,8 @@
   ],
   "links": {
     "homepage": "https://hoprnet.org/",
-    "ui": "http://admin.hopr.public.dappnode/?apiEndpoint=http://hopr.public.dappnode:3001",
-    "api": "http://hopr.public.dappnode:3001/swagger-ui/index.html",
+    "ui": "http://admin.hopr.public.dappnode:4677/?apiEndpoint=http://hopr.public.dappnode:3001",
+    "api": "http://hopr.public.dappnode:3001/scalar",
     "docs": "https://docs.hoprnet.org"
   },
   "repository": {
@@ -53,6 +53,12 @@
       "port": 9091,
       "serviceName": "node"
     },
+    {
+      "name": "GnosisVPN Session port",
+      "description": "Port used for Gnosis VPN",
+      "port": 1422,
+      "serviceName": "node"
+    },
     {
       "name": "HOPR p2p (alt 1)",
       "description": "HOPR P2P port (alternative 1)",
@@ -105,16 +111,12 @@
   "license": "GLP-3.0",
   "backup": [
     {
-      "name": "db",
-      "path": "/app/hoprd-db/db"
-    },
-    {
-      "name": "identity",
-      "path": "/app/hoprd-db/.hopr-identity"
+      "name": "data",
+      "path": "/app/hoprd/data"
     },
     {
       "name": "config",
-      "path": "/app/hoprd.cfg.yaml"
+      "path": "/app/hoprd/conf"
     }
   ],
   "globalEnvs": [

docker-compose.yml

@@ -1,14 +1,16 @@
-version: "3.5"
+version: "3.6"
 services:
   node:
-    # Do not set image name here, it will be set automatically by the sdk.
-    # image: "node.hopr.public.dappnode.eth:1.0.21"
+    # Do not set image field here, it will be set automatically by the sdk.
     build:
       context: .
       args:
+        # see https://console.cloud.google.com/artifacts/docker/hoprassociation/europe-west3/docker-images/hoprd?inv=1&invt=AbqEGg&project=hoprassociation&pli=1
         UPSTREAM_VERSION: >-
-          2.1.3@sha256:c655d605dcb60858b03681e254510dd827b92a51f1312fa4dbb18b5bc5ef9d89
+          2.2.3@sha256:cad18ea69128bc9ae3c43fd776d172978c767eb51a2a001a9d410bb924c7bd51
     ports:
+      - "1422:1422/udp"
+      - "1422:1422/tcp"
       - "3001:3001/tcp"
       - "9091:9091/tcp"
       - "9091:9091/udp"
@@ -28,21 +30,27 @@ services:
       - "9098:9098/udp"
       - "9099:9099/tcp"
       - "9099:9099/udp"
+      - "10000-10100:10000-10100/tcp"
+      - "10000-10100:10000-10100/udp"
     volumes:
-      - "db:/app/hoprd-db"
+      - "data:/app/hoprd/data"
+      - "conf:/app/hoprd/conf"
     security_opt:
       - "seccomp:unconfined"
     environment:
       RUST_LOG: info
-      HOPRD_CONFIGURATION_FILE_PATH: /app/hoprd.cfg.yaml
+      HOPRD_CONFIGURATION_FILE_PATH: /app/hoprd/conf/hoprd.cfg.yaml
       HOPRD_HOST: "127.0.0.1:9091"
       HOPRD_SAFE_ADDRESS: 0x
       HOPRD_MODULE_ADDRESS: 0x
-      HOPRD_HEARTBEAT_THRESHOLD: 60
-      HOPRD_HEARTBEAT_INTERVAL: 20
-      HOPRD_HEARTBEAT_VARIANCE: 1
       HOPRD_PASSWORD: ""
       HOPRD_PROVIDER: ""
+      HOPRD_SESSION_PORT_RANGE: "10000:10100"
+      HOPRD_MAX_BLOCK_RANGE: 100
+      HOPRD_MAX_RPC_REQUESTS_PER_SEC: 10
+      HOPRD_NAT: "true"
+      ADDITIONAL_CMDLINE_ARGS: ""
+      ADDITIONAL_ENVIRONMENT_VARS: ""
     restart: unless-stopped
     deploy:
       resources:
@@ -51,14 +59,17 @@ services:
   admin:
     # The actual image name  will be set automatically by the sdk.
     # This tag only serves to pull the correct image during build.
+    build:
+      context: ./hopr-admin
     image: >-
-      europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.2
+      europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.2.0
     ports:
-      - "3000:80"
+      - "3000:4677"
     restart: unless-stopped
     deploy:
       resources:
         limits:
           memory: 256M
 volumes:
-  db: {}
+  data: {}
+  conf: {}

entrypoint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+env ${ADDITIONAL_ENVIRONMENT_VARS} /bin/docker-entrypoint.sh ${ADDITIONAL_CMDLINE_ARGS}

hopr-admin/Dockerfile

@@ -0,0 +1,3 @@
+FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.14
+
+ENTRYPOINT ["nginx", "-g", "daemon off;"]

hoprd.cfg.yaml

@@ -1,62 +1,44 @@
 ---
-
 hopr:
   db:
-    data: /app/hoprd-db/db
+    data: /app/hoprd/data
     initialize: true
     force_initialize: false
   strategy:
     on_fail_continue: true
     allow_recursive: true
     strategies:
       - !Aggregating
-        aggregation_threshold: 100
+        aggregation_threshold: 250
         unrealized_balance_ratio: 0.9
         aggregate_on_channel_close: true
       - !AutoRedeeming
         redeem_only_aggregated: true
-        on_close_redeem_single_tickets_value_min: "90000000000000000 HOPR"
-        minimum_redeem_ticket_value: "30000000000000000000 HOPR"
+        minimum_redeem_ticket_value: "2500000000000000000 HOPR"
       - !ClosureFinalizer
-        max_closure_overdue: 3600
-  network_options:
-    min_delay: 1
-    max_delay: 300
-    quality_bad_threshold: 0.2
-    quality_offline_threshold: 0.5
-    quality_step: 0.1
-    quality_avg_window_size: 25
-    ignore_timeframe: 600
-    backoff_exponent: 1.5
-    backoff_min: 2.0
-    backoff_max: 300.0
+        max_closure_overdue: 300
   protocol:
-    ack:
-      timeout: 15
     heartbeat:
       timeout: 15
-    msg:
-      timeout: 15
     ticket_aggregation:
       timeout: 15
   chain:
     announce: true
-    check_unrealized_balance: true
     network: dufour
+    keep_logs: true
+    fast_sync: true
   safe_module:
-    safe_transaction_service_provider: https://safe-transaction.prod.hoprtech.net/
+    safe_transaction_service_provider: https://safe-transaction.prod.hoprnet.link/
   transport:
     announce_local_addresses: false
     prefer_local_addresses: false
 identity:
-  file: /app/hoprd-db/.hopr-identity
+  file: /app/hoprd/conf/hopr.id
 api:
   enable: true
   host:
     address: !IPv4 0.0.0.0
     port: 3001
-inbox:
-  capacity: 512
-  max_age: 900
-  excluded_tags:
-    - 0
+session_ip_forwarding:
+  target_allow_list: []
+

justfile

@@ -0,0 +1,3 @@
+# build the dappnode package
+build:
+  npx @dappnode/dappnodesdk build