Preparations for 2.1 release

.gitignore

@@ -3,3 +3,10 @@
 /build/
 /.direnv/
 /node_modules/
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.1.0.cjs

Dockerfile

@@ -4,4 +4,6 @@ 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
 
-ENTRYPOINT ["/usr/bin/tini", "--", "node", "./lib/main.cjs"]
+ADD hoprd.cfg.yaml /app/hoprd.cfg.yaml
+
+ENTRYPOINT ["/bin/hoprd", "--configurationFilePath", "/app/hoprd.cfg.yaml"]

README.md

@@ -10,4 +10,4 @@ To install HOPR follow the instructions [here.](https://docs.hoprnet.org/node/us
 
 Hopr Admin: v0.6.5
 
-Hoprd: v2.0.0-rc.10
+Hoprd: v2.1.0-rc.1

dappnode_package.json

@@ -1,7 +1,7 @@
 {
   "name": "hopr.public.dappnode.eth",
-  "version": "1.0.20",
-  "upstreamVersion": "providence",
+  "version": "1.0.21",
+  "upstreamVersion": "saint-louis",
   "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": [

docker-compose.yml

@@ -1,46 +1,36 @@
 version: "3.5"
 services:
   node:
-    image: "node.hopr.public.dappnode.eth:1.0.20"
+    image: "node.hopr.public.dappnode.eth:1.0.21"
     build:
       context: .
       args:
-        UPSTREAM_VERSION: "2.1.0-rc.1@sha256:233c6aaa40c90f76e74a5b6432e3a36c4ce2d33b05f06c9df33bb2afc0072edf"
+        UPSTREAM_VERSION: 2.1.0-rc.1@sha256:233c6aaa40c90f76e74a5b6432e3a36c4ce2d33b05f06c9df33bb2afc0072edf
     ports:
       - "9091:9091/tcp"
       - "9091:9091/udp"
       - "3001"
     volumes:
-      - "db:/app/hoprd-db"
+      - "data:/app/data"
     environment:
-      - DEBUG=hopr*
-      - HOPRD_ANNOUNCE=true
+      - RUST_LOG=info
       - HOPRD_NETWORK=dufour
-      - HOPRD_API=true
-      - HOPRD_API_HOST=0.0.0.0
-      - HOPRD_API_PORT=3001
-      - HOPRD_HEALTH_CHECK=true
-      - HOPRD_HEALTH_CHECK_HOST=0.0.0.0
-      - HOPRD_HEALTH_CHECK_PORT=8080
-      - HOPRD_API_TOKEN=!5qxc9Lp1BE7IFQ-nrtttU
-      - HOPRD_DISABLE_API_AUTHENTICATION=true
-      - HOPRD_IDENTITY=/app/hoprd-db/.hopr-identity
-      - HOPRD_DATA=/app/hoprd-db/data
-      - HOPRD_INIT=true
-      - "HOPRD_HOST=127.0.0.1:9091"
+      - HOPRD_HOST=127.0.0.1:9091
       - HOPRD_SAFE_ADDRESS=0x
       - HOPRD_MODULE_ADDRESS=0x
-      - HOPRD_HEARTBEAT_THRESHOLD=60000
-      - HOPRD_HEARTBEAT_INTERVAL=20000
-      - HOPRD_PASSWORD="open-sesame-iTwnsPNg0hpagP+o6T0KOwiH9RQ0"
-      - "HOPRD_PROVIDER=https://provider-proxy.hoprnet.workers.dev/xdai_mainnet"
+      - HOPRD_HEARTBEAT_THRESHOLD=60
+      - HOPRD_HEARTBEAT_INTERVAL=20
+      - HOPRD_HEARTBEAT_VARIANCE=1
+      - HOPRD_PASSWORD=open-sesame-iTwnsPNg0hpagP+o6T0KOwiH9RQ0
+      - HOPRD_PROVIDER=https://primary.gnosis-chain.rpc.hoprtech.net/
     restart: unless-stopped
     deploy:
       resources:
         limits:
-          memory: 3G
+          memory: 2G
   admin:
-    image: "europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin@sha256:b354b698ece88155607fcc0d325e57786ce0e15bb9d40dc180826ac3c1000c13"
+    image: >-
+      europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin@sha256:b354b698ece88155607fcc0d325e57786ce0e15bb9d40dc180826ac3c1000c13
     ports:
       - "3000:80"
     restart: unless-stopped
@@ -49,4 +39,4 @@ services:
         limits:
           memory: 256M
 volumes:
-  db: {}
+  data: {}

hoprd.cfg.yaml

@@ -0,0 +1,52 @@
+---
+
+hopr:
+  db:
+    data: /app/data/db
+    initialize: true
+    force_initialize: false
+  strategy:
+    on_fail_continue: true
+    allow_recursive: true
+    finalize_channel_closure: true
+    strategies: []
+  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
+  protocol:
+    ack:
+      timeout: 15
+    heartbeat:
+      timeout: 15
+    msg:
+      timeout: 15
+    ticket_aggregation:
+      timeout: 15
+  chain:
+    announce: true
+    check_unrealized_balance: true
+  safe_module:
+    safe_transaction_service_provider: https://safe-transaction.prod.hoprtech.net/
+  transport:
+    announce_local_addresses: false
+    prefer_local_addresses: false
+identity:
+  file: '/app/data/hoprd.id'
+api:
+  enable: true
+  host:
+    address: !IPv4 0.0.0.0
+    port: 3001
+inbox:
+  capacity: 512
+  max_age: 900
+  excluded_tags:
+    - 0

package.json

@@ -2,8 +2,8 @@
   "name": "hopr-dappnode",
   "repository": "https://github.com/dappnode/DAppNodePackage-Hopr",
   "private": true,
-  "packageManager": "yarn@3.2.1",
+  "packageManager": "yarn@4.1.0",
   "devDependencies": {
-    "@dappnode/dappnodesdk": "^0.2.68"
+    "@dappnode/dappnodesdk": "^0.3.14"
   }
 }

setup-wizard.yml

@@ -5,37 +5,48 @@ fields:
       type: environment
       name: HOPRD_PASSWORD
       service: node
-    title: Database Password
+    title: Identity file password
     required: true
-    description: It's the password which will be used to encrypt the database.
+    description: >-
+      Password used to decrypt the identity file.
+      **Please change this value!**
     secret: true
+
   - id: HOPRD_API_TOKEN
     target:
       type: environment
       name: HOPRD_API_TOKEN
       service: node
-    title: Api token
+    title: REST API token
     required: false
-    description: It's the password which will be used to access to the logs
+    description: >-
+      Secret token to the REST API exposed by the node.
+      **Please change this value!**
     secret: true
+
   - id: HOPRD_PROVIDER
     target:
       type: environment
       name: HOPRD_PROVIDER
       service: node
     title: RPC Provider URL
     required: false
-    description: Optional URL to the custom RPC provider this HOPR node should use.
+    description: >-
+      URL to the custom RPC provider this HOPR node should use.
+      If your DAppnode is running an Ethereum client, put its URL here.
+      Example: http://nethermind-xdai.dappnode:8545
     secret: false
+
   - id: HOPRD_NETWORK
     target:
       type: environment
       name: HOPRD_NETWORK
       service: node
     title: HOPR network name
     required: false
-    description: Optional network environment this HOPR node should use.
+    description: Optional HOPR network environment this HOPR node should use.
     secret: false
+
   - id: IDENTITY
     target:
       type: fileUpload
@@ -45,30 +56,53 @@ fields:
     required: false
     description: Upload custom identity file of a previously deployed HOPR node.
     secret: false
+
   - id: HOPRD_SAFE_ADDRESS
     target:
       type: environment
       name: HOPRD_SAFE_ADDRESS
       service: node
     title: Staking safe address
     required: true
-    description: Ethereum address of the associated staking safe
+    description: >-
+      Ethereum address of the associated staking safe.
+      Example: 0x010203040506070809aabbccddeeff00112233
     secret: false
+    pattern: "^0x[a-fA-F0-9]{40}$"
+    patternErrorMessage: Must be a valid Ethereum address!
+
   - id: HOPRD_MODULE_ADDRESS
     target:
       type: environment
       name: HOPRD_MODULE_ADDRESS
       service: node
     title: Staking safe module address
     required: true
-    description: Ethereum address of the module connectedd to the associated staking safe
+    description: >-
+      Ethereum address of the module connected to the associated staking safe.
+      Example: 0x010203040506070809aabbccddeeff00112233
     secret: false
+    pattern: "^0x[a-fA-F0-9]{40}$"
+    patternErrorMessage: Must be a valid Ethereum address!
+
   - id: HOPRD_HOST
     target:
       type: environment
       name: HOPRD_HOST
       service: node
-    title: Host IP/Port mapping
+    title: Public host IP and port
     required: true
-    description: Mapping of the public ip and p2p port
+    description: >-
+      Must contain the "host:port" binding where the node should listen.
+      on your router and exposed to the Internet.
+      You can also use the (dyn)DNS name of your node as "host".
+      The "host" part must be an external public IP address or DNS name of this node.
+      The recommended default TCP "port" is 9091. Make sure the given port is port-forwarded
+      on your router and exposed to the Internet.
+
+      Example (public IP address): 1.2.3.4:9091
+      Example (dynDNS entry): abcd1234.dyndns.dappnode.io:9091
     secret: false
+    pattern: "^[a-z0-9.]{3,}:[0-9]{2,5}$"
+    patternErrorMessage: Must be in correct host:port format!
+

shell.nix

@@ -17,9 +17,9 @@ mkShell {
     ## base
     envsubst
 
-    ## node, minimum recommended version is v16, see README for more details
-    nodejs-16_x # v16.5.0
-    (yarn.override { nodejs = nodejs-16_x; }) # v1.22.10
+    # build utils
+    nodejs_20
+    (yarn.override { nodejs = nodejs_20; })
 
     # custom pkg groups
     macosPkgs