Rename folders to be aligned with docker-compose setup

.github/workflows/release.yml

@@ -45,8 +45,8 @@ jobs:
           email: ${{ secrets.ZULIP_EMAIL }}
           organization-url: "https://hopr.zulipchat.com"
           type: "stream"
-          to: "Releases"
-          topic: "main"
+          to: "HOPRd"
+          topic: "Releases"
           content: |
             A new hoprd dAppNode package (dufour) version is available.
             - IPFS Hash: ${{ steps.publish.outputs.ipfs_hash }}

DEVELOPING.md

@@ -8,7 +8,7 @@ There are three repositories:
 
 The `internal` is a fork of the `official` one.  The `testnet` repo is configured specifically to use our `rotsee` testnet
 
-Tha development happens on the internal repository and it has two branches:
+The development happens on the internal repository and it has two branches:
 
 - `develop` which contains the edge version, not meant for publishing
 - `main` which is supposed to be in-sync with the `main` branch on the `official` repo

Dockerfile

@@ -4,7 +4,7 @@ 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
 
 RUN chmod +rx /bin/entrypoint.sh

dappnode_package.json

@@ -1,7 +1,7 @@
 {
   "name": "hopr.public.dappnode.eth",
   "version": "1.0.19",
-  "upstreamVersion": "singapore",
+  "upstreamVersion": "kaunas",
   "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": [
@@ -21,7 +21,7 @@
   "links": {
     "homepage": "https://hoprnet.org/",
     "ui": "http://admin.hopr.public.dappnode:4677/?apiEndpoint=http://hopr.public.dappnode:3001",
-    "api": "http://hopr.public.dappnode:3001/scalar",
+    "api": "http://hopr.public.dappnode:3001/swagger-ui/index.html",
     "docs": "https://docs.hoprnet.org"
   },
   "repository": {
@@ -111,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

@@ -7,7 +7,7 @@ services:
       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.2.3@sha256:cad18ea69128bc9ae3c43fd776d172978c767eb51a2a001a9d410bb924c7bd51
+          3.0.0@sha256:fa9764f5e9927094960f63dfb68dbf6cbc237210559a890f1effa29da6e92ecd
     ports:
       - "1422:1422/udp"
       - "1422:1422/tcp"
@@ -33,12 +33,13 @@ services:
       - "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
@@ -61,7 +62,7 @@ services:
     build:
       context: ./hopr-admin
     image: >-
-      europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.14
+      europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:3.0.3
     ports:
       - "3000:4677"
     restart: unless-stopped
@@ -70,4 +71,5 @@ services:
         limits:
           memory: 256M
 volumes:
-  db: {}
+  data: {}
+  conf: {}

hopr-admin/Dockerfile

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

hoprd.cfg.yaml

@@ -1,39 +1,30 @@
 ---
 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: 250
-        unrealized_balance_ratio: 0.9
-        aggregate_on_channel_close: true
       - !AutoRedeeming
-        redeem_only_aggregated: true
-        minimum_redeem_ticket_value: "2500000000000000000 HOPR"
+        redeem_only_aggregated: false
+        minimum_redeem_ticket_value: "1 wxHOPR"
       - !ClosureFinalizer
         max_closure_overdue: 300
-  protocol:
-    heartbeat:
-      timeout: 15
-    ticket_aggregation:
-      timeout: 15
   chain:
     announce: 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: