From a9e7477fff8f1d78856398007bfa6664f7afe350 Mon Sep 17 00:00:00 2001 From: HOPR Bot <68553210+hopr-bot@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:30:38 +0200 Subject: [PATCH 01/41] Update to release 2.1.4 (#145) * Update to release 2.1.4 * Updating SDK * Updating to latest --------- Co-authored-by: hopr-bot Co-authored-by: ausias-armesto --- docker-compose.yml | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 12c874b..fb3c32c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: context: . args: UPSTREAM_VERSION: >- - 2.1.3@sha256:c655d605dcb60858b03681e254510dd827b92a51f1312fa4dbb18b5bc5ef9d89 + 2.1.4@sha256:3618cdba157242264502bbda72b5a7fedc76d4895bb7d9f5a884a3baa9c625af ports: - "3001:3001/tcp" - "9091:9091/tcp" @@ -52,7 +52,7 @@ services: # The actual image name will be set automatically by the sdk. # This tag only serves to pull the correct image during build. 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.1.4 ports: - "3000:80" restart: unless-stopped diff --git a/package.json b/package.json index 6bb067a..782998c 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,6 @@ "repository": "https://github.com/dappnode/DAppNodePackage-Hopr", "private": true, "devDependencies": { - "@dappnode/dappnodesdk": "^0.3.22" + "@dappnode/dappnodesdk": "^0.3.32" } } From 3d932bda80e4489b03605cadb179a3aaf30b94ff Mon Sep 17 00:00:00 2001 From: QYuQianchen <10935300+QYuQianchen@users.noreply.github.com> Date: Mon, 12 Aug 2024 22:45:19 +0800 Subject: [PATCH 02/41] udpate package-lock.json (#147) --- package-lock.json | 472 +++++++++++++++++++++++++--------------------- 1 file changed, 259 insertions(+), 213 deletions(-) diff --git a/package-lock.json b/package-lock.json index 417f3f1..83395ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -37,15 +37,15 @@ } }, "node_modules/@dappnode/dappnodesdk": { - "version": "0.3.22", - "resolved": "https://registry.npmjs.org/@dappnode/dappnodesdk/-/dappnodesdk-0.3.22.tgz", - "integrity": "sha512-boeM5hvl/7ySb6+O5zZYTsY5duKIm1HY3QrtvDIfnOUOHg/h3082CeO1eix9cqSWTyBknBUNuIgq+NwyWs2ncw==", + "version": "0.3.32", + "resolved": "https://registry.npmjs.org/@dappnode/dappnodesdk/-/dappnodesdk-0.3.32.tgz", + "integrity": "sha512-5OptK4bzsBeA616l07zwNsZANTJMnXs1GA6hGsyke+WvtNUVd4MZAnyQ0RlfhUk9G5rVqwAhHzOW6IRTuPWCFg==", "dev": true, "dependencies": { - "@dappnode/schemas": "^0.1.20", + "@dappnode/schemas": "^0.1.21", "@dappnode/toolkit": "^0.1.21", "@dappnode/types": "^0.1.39", - "@octokit/rest": "^18.0.12", + "@octokit/rest": "^20.1.1", "async-retry": "^1.2.3", "chalk": "^2.4.2", "cli-progress": "^3.8.2", @@ -80,9 +80,9 @@ } }, "node_modules/@dappnode/schemas": { - "version": "0.1.20", - "resolved": "https://registry.npmjs.org/@dappnode/schemas/-/schemas-0.1.20.tgz", - "integrity": "sha512-B44wqcumy84XFaqcP/mu6oySVRZ+Vrdsg3va5zJwdbvmhpHoAnqgvW/DVpP9ofxToOYkyn5iL8fPEO9IrNllPg==", + "version": "0.1.21", + "resolved": "https://registry.npmjs.org/@dappnode/schemas/-/schemas-0.1.21.tgz", + "integrity": "sha512-CEuSZfuFzvZw+HE56x+PJtbvg6Z06iF1OzhyyTNMvtzpIO8giir+dtKx8BvgBWc5rYCPTsa3ryhJg8VARC+jnA==", "dev": true, "dependencies": { "@dappnode/types": "^0.1.38", @@ -141,9 +141,9 @@ "dev": true }, "node_modules/@dappnode/toolkit/node_modules/ethers": { - "version": "6.12.1", - "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.12.1.tgz", - "integrity": "sha512-j6wcVoZf06nqEcBbDWkKg8Fp895SS96dSnTCjiXT+8vt2o02raTn4Lo9ERUuIVU5bAjoPYeA+7ytQFexFmLuVw==", + "version": "6.13.2", + "resolved": "https://registry.npmjs.org/ethers/-/ethers-6.13.2.tgz", + "integrity": "sha512-9VkriTTed+/27BGuY1s0hf441kqwHJ1wtN2edksEtiRvXx+soxRX3iSXTfFqq2+YwrOqbDoTHjIhQnjJRlzKmg==", "dev": true, "funding": [ { @@ -162,12 +162,33 @@ "@types/node": "18.15.13", "aes-js": "4.0.0-beta.5", "tslib": "2.4.0", - "ws": "8.5.0" + "ws": "8.17.1" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@dappnode/toolkit/node_modules/ws": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz", + "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==", + "dev": true, + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": ">=5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, "node_modules/@dappnode/types": { "version": "0.1.39", "resolved": "https://registry.npmjs.org/@dappnode/types/-/types-0.1.39.tgz", @@ -193,9 +214,9 @@ } }, "node_modules/@ipld/car": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@ipld/car/-/car-5.3.0.tgz", - "integrity": "sha512-OB8LVvJeVAFFGluNIkZeDZ/aGeoekFKsuIvNT9I5sJIb5WekQuW5+lekjQ7Z7mZ7DBKuke/kI4jBT1j0/akU1w==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/@ipld/car/-/car-5.3.2.tgz", + "integrity": "sha512-Bb4XrCFlnsCb9tTzZ1I8zo9O61D9qm7HfvuYrQ9gzdE8YhjyVIjrjmHmnoSWV/uCmyc2/bcqiDPIg+9WljXNzg==", "dev": true, "dependencies": { "@ipld/dag-cbor": "^9.0.7", @@ -209,15 +230,15 @@ } }, "node_modules/@ipld/car/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.2.2.tgz", + "integrity": "sha512-RWI+nyf0q64vyOxL8LbKtjJMki0sogRL/8axvklNtiTM0iFCVtHwME9w6+0P1/v4dQvsIg8A45oT3ka1t/M/+A==", "dev": true }, "node_modules/@ipld/dag-cbor": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-9.2.0.tgz", - "integrity": "sha512-N14oMy0q4gM6OuZkIpisKe0JBSjf1Jb39VI+7jMLiWX9124u1Z3Fdj/Tag1NA0cVxxqWDh0CqsjcVfOKtelPDA==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/@ipld/dag-cbor/-/dag-cbor-9.2.1.tgz", + "integrity": "sha512-nyY48yE7r3dnJVlxrdaimrbloh4RokQaNRdI//btfTkcTEZbpmSrbYcBQ4VKTf8ZxXAOUJy4VsRpkJo+y9RTnA==", "dev": true, "dependencies": { "cborg": "^4.0.0", @@ -229,15 +250,15 @@ } }, "node_modules/@ipld/dag-cbor/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.2.2.tgz", + "integrity": "sha512-RWI+nyf0q64vyOxL8LbKtjJMki0sogRL/8axvklNtiTM0iFCVtHwME9w6+0P1/v4dQvsIg8A45oT3ka1t/M/+A==", "dev": true }, "node_modules/@ipld/dag-json": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@ipld/dag-json/-/dag-json-10.2.0.tgz", - "integrity": "sha512-O9YLUrl3d3WbVz7v1WkajFkyfOLEe2Fep+wor4fgVe0ywxzrivrj437NiPcVyB+2EDdFn/Q7tCHFf8YVhDf8ZA==", + "version": "10.2.2", + "resolved": "https://registry.npmjs.org/@ipld/dag-json/-/dag-json-10.2.2.tgz", + "integrity": "sha512-NnU8HdHKwAoGyrW3S09NMa8aZw0tImLRyR64hoafpLpDpAbA9g1+fb24JsdlugbL4sXUQVwDVA+qK4Ud8V83lA==", "dev": true, "dependencies": { "cborg": "^4.0.0", @@ -249,15 +270,15 @@ } }, "node_modules/@ipld/dag-json/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.2.2.tgz", + "integrity": "sha512-RWI+nyf0q64vyOxL8LbKtjJMki0sogRL/8axvklNtiTM0iFCVtHwME9w6+0P1/v4dQvsIg8A45oT3ka1t/M/+A==", "dev": true }, "node_modules/@ipld/dag-pb": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@ipld/dag-pb/-/dag-pb-4.1.0.tgz", - "integrity": "sha512-LJU451Drqs5zjFm7jI4Hs3kHlilOqkjcSfPiQgVsZnWaYb2C7YdfhnclrVn/X+ucKejlU9BL3+gXFCZUXkMuCg==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@ipld/dag-pb/-/dag-pb-4.1.2.tgz", + "integrity": "sha512-BSztO4l3C+ya9HjCaQot26Y4AVsqIKtnn6+23ubc1usucnf6yoTBme18oCCdM6gKBMxuPqju5ye3lh9WEJsdeQ==", "dev": true, "dependencies": { "multiformats": "^13.1.0" @@ -268,9 +289,9 @@ } }, "node_modules/@ipld/dag-pb/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.2.2.tgz", + "integrity": "sha512-RWI+nyf0q64vyOxL8LbKtjJMki0sogRL/8axvklNtiTM0iFCVtHwME9w6+0P1/v4dQvsIg8A45oT3ka1t/M/+A==", "dev": true }, "node_modules/@leichtgewicht/ip-codec": { @@ -320,12 +341,12 @@ } }, "node_modules/@libp2p/interface": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-1.3.1.tgz", - "integrity": "sha512-KJoYP6biAgIHUU3pxaixaaYCvIHZshzXetxfoNigadAZ3hCGuwpdFhk7IABEaI3RgadOOYUwW3MXPbL+cxnXVQ==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@libp2p/interface/-/interface-1.6.3.tgz", + "integrity": "sha512-Tm8W5Q2FsjcSdeA5BvP/GTUq/lp3SjeW6GPmWbbIasBJdv67UGHahu8YDFTME90IxTijnikkfGNkOPsd/4UuvA==", "dev": true, "dependencies": { - "@multiformats/multiaddr": "^12.2.1", + "@multiformats/multiaddr": "^12.2.3", "it-pushable": "^3.2.3", "it-stream-types": "^2.0.1", "multiformats": "^13.1.0", @@ -429,9 +450,9 @@ } }, "node_modules/@libp2p/interface/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.2.2.tgz", + "integrity": "sha512-RWI+nyf0q64vyOxL8LbKtjJMki0sogRL/8axvklNtiTM0iFCVtHwME9w6+0P1/v4dQvsIg8A45oT3ka1t/M/+A==", "dev": true }, "node_modules/@libp2p/interfaces": { @@ -521,9 +542,9 @@ } }, "node_modules/@multiformats/multiaddr": { - "version": "12.2.1", - "resolved": "https://registry.npmjs.org/@multiformats/multiaddr/-/multiaddr-12.2.1.tgz", - "integrity": "sha512-UwjoArBbv64FlaetV4DDwh+PUMfzXUBltxQwdh+uTYnGFzVa8ZfJsn1vt1RJlJ6+Xtrm3RMekF/B+K338i2L5Q==", + "version": "12.3.0", + "resolved": "https://registry.npmjs.org/@multiformats/multiaddr/-/multiaddr-12.3.0.tgz", + "integrity": "sha512-JQ8Gc/jgucqqvEaDTFN/AvxlYDHEE7lgEWLMYW7hKZkWggER+GvG/tVxUgUxIP8M0vFpvEHKKHE0lKzyMsgi8Q==", "dev": true, "dependencies": { "@chainsafe/is-ip": "^2.0.1", @@ -545,9 +566,9 @@ } }, "node_modules/@multiformats/multiaddr/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.2.2.tgz", + "integrity": "sha512-RWI+nyf0q64vyOxL8LbKtjJMki0sogRL/8axvklNtiTM0iFCVtHwME9w6+0P1/v4dQvsIg8A45oT3ka1t/M/+A==", "dev": true }, "node_modules/@multiformats/murmur3": { @@ -565,9 +586,9 @@ } }, "node_modules/@multiformats/murmur3/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.2.2.tgz", + "integrity": "sha512-RWI+nyf0q64vyOxL8LbKtjJMki0sogRL/8axvklNtiTM0iFCVtHwME9w6+0P1/v4dQvsIg8A45oT3ka1t/M/+A==", "dev": true }, "node_modules/@noble/curves": { @@ -631,135 +652,158 @@ ] }, "node_modules/@octokit/auth-token": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.5.0.tgz", - "integrity": "sha512-r5FVUJCOLl19AxiuZD2VRZ/ORjp/4IN98Of6YJoJOkY75CIBuYfmiNHGrDwXr+aLGG55igl9QrxX3hbiXlLb+g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz", + "integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==", "dev": true, - "dependencies": { - "@octokit/types": "^6.0.3" + "engines": { + "node": ">= 18" } }, "node_modules/@octokit/core": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/@octokit/core/-/core-3.6.0.tgz", - "integrity": "sha512-7RKRKuA4xTjMhY+eG3jthb3hlZCsOwg3rztWh75Xc+ShDWOfDDATWbeZpAHBNRpm4Tv9WgBMOy1zEJYXG6NJ7Q==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.0.tgz", + "integrity": "sha512-1LFfa/qnMQvEOAdzlQymH0ulepxbxnCYAKJZfMci/5XJyIHWgEYnDmgnKakbTh7CH2tFQ5O60oYDvns4i9RAIg==", "dev": true, "dependencies": { - "@octokit/auth-token": "^2.4.4", - "@octokit/graphql": "^4.5.8", - "@octokit/request": "^5.6.3", - "@octokit/request-error": "^2.0.5", - "@octokit/types": "^6.0.3", + "@octokit/auth-token": "^4.0.0", + "@octokit/graphql": "^7.1.0", + "@octokit/request": "^8.3.1", + "@octokit/request-error": "^5.1.0", + "@octokit/types": "^13.0.0", "before-after-hook": "^2.2.0", "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 18" } }, "node_modules/@octokit/endpoint": { - "version": "6.0.12", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.12.tgz", - "integrity": "sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==", + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.5.tgz", + "integrity": "sha512-ekqR4/+PCLkEBF6qgj8WqJfvDq65RH85OAgrtnVp1mSxaXF03u2xW/hUdweGS5654IlC0wkNYC18Z50tSYTAFw==", "dev": true, "dependencies": { - "@octokit/types": "^6.0.3", - "is-plain-object": "^5.0.0", + "@octokit/types": "^13.1.0", "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 18" } }, "node_modules/@octokit/graphql": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-4.8.0.tgz", - "integrity": "sha512-0gv+qLSBLKF0z8TKaSKTsS39scVKF9dbMxJpj3U0vC7wjNWFuIpL/z76Qe2fiuCbDRcJSavkXsVtMS6/dtQQsg==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.0.tgz", + "integrity": "sha512-r+oZUH7aMFui1ypZnAvZmn0KSqAUgE1/tUXIWaqUCa1758ts/Jio84GZuzsvUkme98kv0WFY8//n0J1Z+vsIsQ==", "dev": true, "dependencies": { - "@octokit/request": "^5.6.0", - "@octokit/types": "^6.0.3", + "@octokit/request": "^8.3.0", + "@octokit/types": "^13.0.0", "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 18" } }, "node_modules/@octokit/openapi-types": { - "version": "12.11.0", - "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-12.11.0.tgz", - "integrity": "sha512-VsXyi8peyRq9PqIz/tpqiL2w3w80OgVMwBHltTml3LmVvXiphgeqmY9mvBw9Wu7e0QWk/fqD37ux8yP5uVekyQ==", + "version": "22.2.0", + "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-22.2.0.tgz", + "integrity": "sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==", "dev": true }, "node_modules/@octokit/plugin-paginate-rest": { - "version": "2.21.3", - "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.21.3.tgz", - "integrity": "sha512-aCZTEf0y2h3OLbrgKkrfFdjRL6eSOo8komneVQJnYecAxIej7Bafor2xhuDJOIFau4pk0i/P28/XgtbyPF0ZHw==", + "version": "11.3.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.3.1.tgz", + "integrity": "sha512-ryqobs26cLtM1kQxqeZui4v8FeznirUsksiA+RYemMPJ7Micju0WSkv50dBksTuZks9O5cg4wp+t8fZ/cLY56g==", "dev": true, "dependencies": { - "@octokit/types": "^6.40.0" + "@octokit/types": "^13.5.0" + }, + "engines": { + "node": ">= 18" }, "peerDependencies": { - "@octokit/core": ">=2" + "@octokit/core": "5" } }, "node_modules/@octokit/plugin-request-log": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz", - "integrity": "sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-4.0.1.tgz", + "integrity": "sha512-GihNqNpGHorUrO7Qa9JbAl0dbLnqJVrV8OXe2Zm5/Y4wFkZQDfTreBzVmiRfJVfE4mClXdihHnbpyyO9FSX4HA==", "dev": true, + "engines": { + "node": ">= 18" + }, "peerDependencies": { - "@octokit/core": ">=3" + "@octokit/core": "5" } }, "node_modules/@octokit/plugin-rest-endpoint-methods": { - "version": "5.16.2", - "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.16.2.tgz", - "integrity": "sha512-8QFz29Fg5jDuTPXVtey05BLm7OB+M8fnvE64RNegzX7U+5NUXcOcnpTIK0YfSHBg8gYd0oxIq3IZTe9SfPZiRw==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.2.2.tgz", + "integrity": "sha512-EI7kXWidkt3Xlok5uN43suK99VWqc8OaIMktY9d9+RNKl69juoTyxmLoWPIZgJYzi41qj/9zU7G/ljnNOJ5AFA==", "dev": true, "dependencies": { - "@octokit/types": "^6.39.0", - "deprecation": "^2.3.1" + "@octokit/types": "^13.5.0" + }, + "engines": { + "node": ">= 18" }, "peerDependencies": { - "@octokit/core": ">=3" + "@octokit/core": "^5" } }, "node_modules/@octokit/request": { - "version": "5.6.3", - "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.6.3.tgz", - "integrity": "sha512-bFJl0I1KVc9jYTe9tdGGpAMPy32dLBXXo1dS/YwSCTL/2nd9XeHsY616RE3HPXDVk+a+dBuzyz5YdlXwcDTr2A==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.0.tgz", + "integrity": "sha512-9Bb014e+m2TgBeEJGEbdplMVWwPmL1FPtggHQRkV+WVsMggPtEkLKPlcVYm/o8xKLkpJ7B+6N8WfQMtDLX2Dpw==", "dev": true, "dependencies": { - "@octokit/endpoint": "^6.0.1", - "@octokit/request-error": "^2.1.0", - "@octokit/types": "^6.16.1", - "is-plain-object": "^5.0.0", - "node-fetch": "^2.6.7", + "@octokit/endpoint": "^9.0.1", + "@octokit/request-error": "^5.1.0", + "@octokit/types": "^13.1.0", "universal-user-agent": "^6.0.0" + }, + "engines": { + "node": ">= 18" } }, "node_modules/@octokit/request-error": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.1.0.tgz", - "integrity": "sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.0.tgz", + "integrity": "sha512-GETXfE05J0+7H2STzekpKObFe765O5dlAKUTLNGeH+x47z7JjXHfsHKo5z21D/o/IOZTUEI6nyWyR+bZVP/n5Q==", "dev": true, "dependencies": { - "@octokit/types": "^6.0.3", + "@octokit/types": "^13.1.0", "deprecation": "^2.0.0", "once": "^1.4.0" + }, + "engines": { + "node": ">= 18" } }, "node_modules/@octokit/rest": { - "version": "18.12.0", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-18.12.0.tgz", - "integrity": "sha512-gDPiOHlyGavxr72y0guQEhLsemgVjwRePayJ+FcKc2SJqKUbxbkvf5kAZEWA/MKvsfYlQAMVzNJE3ezQcxMJ2Q==", + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-20.1.1.tgz", + "integrity": "sha512-MB4AYDsM5jhIHro/dq4ix1iWTLGToIGk6cWF5L6vanFaMble5jTX/UBQyiv05HsWnwUtY8JrfHy2LWfKwihqMw==", "dev": true, "dependencies": { - "@octokit/core": "^3.5.1", - "@octokit/plugin-paginate-rest": "^2.16.8", - "@octokit/plugin-request-log": "^1.0.4", - "@octokit/plugin-rest-endpoint-methods": "^5.12.0" + "@octokit/core": "^5.0.2", + "@octokit/plugin-paginate-rest": "11.3.1", + "@octokit/plugin-request-log": "^4.0.0", + "@octokit/plugin-rest-endpoint-methods": "13.2.2" + }, + "engines": { + "node": ">= 18" } }, "node_modules/@octokit/types": { - "version": "6.41.0", - "resolved": "https://registry.npmjs.org/@octokit/types/-/types-6.41.0.tgz", - "integrity": "sha512-eJ2jbzjdijiL3B4PrSQaSjuF2sPEQPVCPzBvTHJD9Nz+9dw2SGH4K4xeQJ77YfTq5bRQ+bD8wT11JbeDPmxmGg==", + "version": "13.5.0", + "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz", + "integrity": "sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==", "dev": true, "dependencies": { - "@octokit/openapi-types": "^12.11.0" + "@octokit/openapi-types": "^22.2.0" } }, "node_modules/@protobufjs/aspromise": { @@ -913,12 +957,12 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.12.12", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz", - "integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==", + "version": "22.2.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.2.0.tgz", + "integrity": "sha512-bm6EG6/pCpkxDf/0gDNDdtDILMOHgaQBVOJGdwsqClnxA3xL6jtMv76rLBc006RVMWbmaf0xbmom4Z/5o2nRkQ==", "dev": true, "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.13.0" } }, "node_modules/@types/responselike": { @@ -937,15 +981,15 @@ "dev": true }, "node_modules/ajv": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz", - "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, "dependencies": { "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.4.1" + "require-from-string": "^2.0.2" }, "funding": { "type": "github", @@ -1046,9 +1090,9 @@ } }, "node_modules/aws4": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz", - "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.1.tgz", + "integrity": "sha512-u5w79Rd7SU4JaIlA/zFqG+gOiuq25q5VLyZ8E+ijJeILuTxVzZgp2CaGw/UTw6pXYN9XMO9yiqj/nEHmhTG5CA==", "dev": true }, "node_modules/balanced-match": { @@ -1128,9 +1172,9 @@ } }, "node_modules/blob-to-it": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/blob-to-it/-/blob-to-it-2.0.6.tgz", - "integrity": "sha512-xveo/z3QNilIJgCZAjzvx2uWWVHE4JzOy7eMp45zkuBsmwZMgjfhn2h/+BsZPaByVFa3u1W/OBUleNiqgMtVpQ==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/blob-to-it/-/blob-to-it-2.0.7.tgz", + "integrity": "sha512-mFAR/GKDDqFOkSBB7shXfsUZwU5DgK453++I8/SImNacfJsdKlx/oHTO0T4ZYHz8A2dnSONE+CX8L29VlWGKiQ==", "dev": true, "dependencies": { "browser-readablestream-to-it": "^2.0.0" @@ -1230,9 +1274,9 @@ "dev": true }, "node_modules/cborg": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/cborg/-/cborg-4.2.0.tgz", - "integrity": "sha512-q6cFW5m3KxfP/9xGI3yGLaC1l5DP6DWM9IvjiJojnIwohL5CQDl02EXViPV852mOfQo+7PJGPN01MI87vFGzyA==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/cborg/-/cborg-4.2.3.tgz", + "integrity": "sha512-XBFbEJ6WMfn9L7woc2t+EzOxF8vGqddoopKBbrhIvZBt2WIUgSlT8xLmM6Aq1xv8eWt4yOSjwxWjYeuHU3CpJA==", "dev": true, "bin": { "cborg": "lib/bin.js" @@ -1561,9 +1605,9 @@ "dev": true }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "dev": true, "dependencies": { "ms": "2.1.2" @@ -1882,6 +1926,12 @@ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, + "node_modules/fast-uri": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", + "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", + "dev": true + }, "node_modules/figlet": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.7.0.tgz", @@ -1984,6 +2034,7 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "dependencies": { "fs.realpath": "^1.0.0", @@ -2030,9 +2081,9 @@ } }, "node_modules/graphql": { - "version": "16.8.1", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz", - "integrity": "sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==", + "version": "16.9.0", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz", + "integrity": "sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==", "dev": true, "engines": { "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" @@ -2223,6 +2274,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, "dependencies": { "once": "^1.3.0", @@ -2303,35 +2355,35 @@ } }, "node_modules/interface-blockstore": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/interface-blockstore/-/interface-blockstore-5.2.10.tgz", - "integrity": "sha512-9K48hTvBCGsKVD3pF4ILgDcf+W2P/gq0oxLcsHGB6E6W6nDutYkzR+7k7bCs9REHrBEfKzcVDEKieiuNM9WRZg==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/interface-blockstore/-/interface-blockstore-5.3.0.tgz", + "integrity": "sha512-MsOE2H9duZdpxXk7KVOQLaQnX4LfqHegshKxSr4b/YD44t13koT5Lg4lphZ0FwB5uvtvqQPm7LNcS0T/5Z2YUQ==", "dev": true, "dependencies": { - "interface-store": "^5.0.0", + "interface-store": "6.0.0", "multiformats": "^13.0.1" } }, "node_modules/interface-blockstore/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.2.2.tgz", + "integrity": "sha512-RWI+nyf0q64vyOxL8LbKtjJMki0sogRL/8axvklNtiTM0iFCVtHwME9w6+0P1/v4dQvsIg8A45oT3ka1t/M/+A==", "dev": true }, "node_modules/interface-datastore": { - "version": "8.2.11", - "resolved": "https://registry.npmjs.org/interface-datastore/-/interface-datastore-8.2.11.tgz", - "integrity": "sha512-9E0iXehfp/j0UbZ2mvlYB4K9pP7uQBCppfuy8WHs1EHF6wLQrM9+zwyX+8Qt6HnH4GKZRyXX/CNXm6oD4+QYgA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/interface-datastore/-/interface-datastore-8.3.0.tgz", + "integrity": "sha512-RM/rTSmRcnoCwGZIHrPm+nlGYVoT4R0lcFvNnDyhdFT4R6BuHHhfFP47UldVEjs98SfxLuMhaNMsyjI918saHw==", "dev": true, "dependencies": { - "interface-store": "^5.0.0", + "interface-store": "6.0.0", "uint8arrays": "^5.0.2" } }, "node_modules/interface-store": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/interface-store/-/interface-store-5.1.8.tgz", - "integrity": "sha512-7na81Uxkl0vqk0CBPO5PvyTkdaJBaezwUJGsMOz7riPOq0rJt+7W31iaopaMICWea/iykUsvNlPx/Tc+MxC3/w==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/interface-store/-/interface-store-6.0.0.tgz", + "integrity": "sha512-HkjsDPsjA7SKkCr+TH1elUQApAAM3X3JPwrz3vFzaf614wI+ZD6GVvwKGZCHYcbSRqeZP/uzVPqezzeISeo5kA==", "dev": true }, "node_modules/ipfs-core-types": { @@ -2376,9 +2428,9 @@ } }, "node_modules/ipfs-core-types/node_modules/@types/node": { - "version": "18.19.33", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.33.tgz", - "integrity": "sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A==", + "version": "18.19.44", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.44.tgz", + "integrity": "sha512-ZsbGerYg72WMXUIE9fYxtvfzLEuq6q8mKERdWFnqTmOvudMxnz+CBNRoOwJ2kNpFOncrKjT1hZwxjlFgQ9qvQA==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -2442,6 +2494,12 @@ "npm": ">=7.0.0" } }, + "node_modules/ipfs-core-types/node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "node_modules/ipfs-core-utils": { "version": "0.18.1", "resolved": "https://registry.npmjs.org/ipfs-core-utils/-/ipfs-core-utils-0.18.1.tgz", @@ -2583,9 +2641,9 @@ } }, "node_modules/ipfs-unixfs-exporter/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.2.2.tgz", + "integrity": "sha512-RWI+nyf0q64vyOxL8LbKtjJMki0sogRL/8axvklNtiTM0iFCVtHwME9w6+0P1/v4dQvsIg8A45oT3ka1t/M/+A==", "dev": true }, "node_modules/ipfs-utils": { @@ -2679,9 +2737,9 @@ } }, "node_modules/is-ipfs/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.2.2.tgz", + "integrity": "sha512-RWI+nyf0q64vyOxL8LbKtjJMki0sogRL/8axvklNtiTM0iFCVtHwME9w6+0P1/v4dQvsIg8A45oT3ka1t/M/+A==", "dev": true }, "node_modules/is-observable": { @@ -2705,15 +2763,6 @@ "node": ">=8" } }, - "node_modules/is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-promise": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz", @@ -2761,9 +2810,9 @@ } }, "node_modules/it-filter": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/it-filter/-/it-filter-3.1.0.tgz", - "integrity": "sha512-FiYuzdsUhmMZJTJQ8YLdgX3ArjQmAtCG1lyrtZd+92/2eC6YO9UoybdrwVj/yyZkuXAPykrSipLuZ+KSKpt29A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/it-filter/-/it-filter-3.1.1.tgz", + "integrity": "sha512-TOXmVuaSkxlLp2hXKoMTra0WMZMKVFxE3vSsbIA+PbADNCBAHhjJ/lM31vBOUTddHMO34Ku++vU8T9PLlBxQtg==", "dev": true, "dependencies": { "it-peekable": "^3.0.0" @@ -2796,9 +2845,9 @@ "dev": true }, "node_modules/it-map": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/it-map/-/it-map-3.1.0.tgz", - "integrity": "sha512-B7zNmHYRE0qes8oTiNYU7jXEF5WvKZNAUosskCks1JT9Z4DNwRClrQyd+C/hgITG8ewDbVZMGx9VXAx3KMY2kA==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/it-map/-/it-map-3.1.1.tgz", + "integrity": "sha512-9bCSwKD1yN1wCOgJ9UOl+46NQtdatosPWzxxUk2NdTLwRPXLh+L7iwCC9QKsbgM60RQxT/nH8bKMqm3H/o8IHQ==", "dev": true, "dependencies": { "it-peekable": "^3.0.0" @@ -2814,18 +2863,18 @@ } }, "node_modules/it-parallel": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/it-parallel/-/it-parallel-3.0.7.tgz", - "integrity": "sha512-aIIc2t8knfER/mQu4uEHaAYZrnj/2Tdp+Vj6BA94Gi7xghx1kblvpyrLkCYO9K+eDyPS1cE3Vfhh9a20MEmzXA==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/it-parallel/-/it-parallel-3.0.8.tgz", + "integrity": "sha512-URLhs6eG4Hdr4OdvgBBPDzOjBeSSmI+Kqex2rv/aAyYClME26RYHirLVhZsZP5M+ZP6M34iRlXk8Wlqtezuqpg==", "dev": true, "dependencies": { "p-defer": "^4.0.1" } }, "node_modules/it-peekable": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/it-peekable/-/it-peekable-3.0.4.tgz", - "integrity": "sha512-Bb4xyMX5xAveFyh9ySbCrHMCpIF0+fIbl+0ZkcxP94JVofLe5j/mSBK0gjrrISsSVURVyey8X4L/IqrekOxjiA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/it-peekable/-/it-peekable-3.0.5.tgz", + "integrity": "sha512-JWQOGMt6rKiPcY30zUVMR4g6YxkpueTwHVE7CMs/aGqCf4OydM6w+7ZM3PvmO1e0TocjuR4aL8xyZWR46cTqCQ==", "dev": true }, "node_modules/it-pipe": { @@ -3366,9 +3415,9 @@ "dev": true }, "node_modules/nan": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz", - "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==", + "version": "2.20.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz", + "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==", "dev": true, "optional": true }, @@ -3647,19 +3696,15 @@ } }, "node_modules/progress-events": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/progress-events/-/progress-events-1.0.0.tgz", - "integrity": "sha512-zIB6QDrSbPfRg+33FZalluFIowkbV5Xh1xSuetjG+rlC5he6u2dc6VQJ0TbMdlN3R1RHdpOqxEFMKTnQ+itUwA==", - "dev": true, - "engines": { - "node": ">=16.0.0", - "npm": ">=7.0.0" - } + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/progress-events/-/progress-events-1.0.1.tgz", + "integrity": "sha512-MOzLIwhpt64KIVN64h1MwdKWiyKFNc/S6BoYKPIVUHFg0/eIEyBulhWCgn678v/4c0ri3FdGuzXymNCv02MUIw==", + "dev": true }, "node_modules/protobufjs": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.0.tgz", - "integrity": "sha512-YWD03n3shzV9ImZRX3ccbjqLxj7NokGN0V/ESiBV5xWqrommYHYiihuIyavq03pWSGqlyvYUFmfoMKd+1rPA/g==", + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz", + "integrity": "sha512-RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -3681,9 +3726,9 @@ } }, "node_modules/protons-runtime": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/protons-runtime/-/protons-runtime-5.4.0.tgz", - "integrity": "sha512-XfA++W/WlQOSyjUyuF5lgYBfXZUEMP01Oh1C2dSwZAlF2e/ZrMRPfWonXj6BGM+o8Xciv7w0tsRMKYwYEuQvaw==", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/protons-runtime/-/protons-runtime-5.5.0.tgz", + "integrity": "sha512-EsALjF9QsrEk6gbCx3lmfHxVN0ah7nG3cY7GySD4xf4g8cr7g543zB88Foh897Sr1RQJ9yDCUsoT1i1H/cVUFA==", "dev": true, "dependencies": { "uint8-varint": "^2.0.2", @@ -3883,6 +3928,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "dependencies": { "glob": "^7.1.3" @@ -3948,9 +3994,9 @@ "dev": true }, "node_modules/semver": { - "version": "7.6.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", - "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", "dev": true, "bin": { "semver": "bin/semver.js" @@ -4291,9 +4337,9 @@ } }, "node_modules/uint8arrays/node_modules/multiformats": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.1.0.tgz", - "integrity": "sha512-HzdtdBwxsIkzpeXzhQ5mAhhuxcHbjEHH+JQoxt7hG/2HGFjjwyolLo7hbaexcnhoEuV4e0TNJ8kkpMjiEYY4VQ==", + "version": "13.2.2", + "resolved": "https://registry.npmjs.org/multiformats/-/multiformats-13.2.2.tgz", + "integrity": "sha512-RWI+nyf0q64vyOxL8LbKtjJMki0sogRL/8axvklNtiTM0iFCVtHwME9w6+0P1/v4dQvsIg8A45oT3ka1t/M/+A==", "dev": true }, "node_modules/undici": { @@ -4309,9 +4355,9 @@ } }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.13.0.tgz", + "integrity": "sha512-xtFJHudx8S2DSoujjMd1WeWvn7KKWFRESZTMeL1RptAYERu29D6jphMjjY+vn96jvN3kVPDNxU/E13VTaXj6jg==", "dev": true }, "node_modules/universal-user-agent": { @@ -4474,9 +4520,9 @@ } }, "node_modules/yaml": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.2.tgz", - "integrity": "sha512-B3VqDZ+JAg1nZpaEmWtTXUlBneoGx6CPM9b0TENK6aoSu5t73dItudwdgmi6tHlIZZId4dZ9skcAQ2UbcyAeVA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz", + "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==", "dev": true, "bin": { "yaml": "bin.mjs" From f6b5c7a2366345ec4c105dd4db61df412c218677 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Mon, 12 Aug 2024 18:22:22 +0200 Subject: [PATCH 03/41] Adding build context (#148) * Adding build context * Adding a dummy dockerfile * Using fixed tag --- docker-compose.yml | 2 ++ hopr-admin/Dockerfile | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 hopr-admin/Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml index fb3c32c..21ddb75 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,6 +51,8 @@ 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.4 ports: diff --git a/hopr-admin/Dockerfile b/hopr-admin/Dockerfile new file mode 100644 index 0000000..2943806 --- /dev/null +++ b/hopr-admin/Dockerfile @@ -0,0 +1,3 @@ +FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:stable + +ENTRYPOINT ["nginx", "-g", "daemon off;"] \ No newline at end of file From 2420dba424c0ef443c63cb680a0e52badbdc9243 Mon Sep 17 00:00:00 2001 From: Jean Demeusy <61140535+jeandemeusy@users.noreply.github.com> Date: Tue, 27 Aug 2024 11:06:55 +0200 Subject: [PATCH 04/41] update --- docker-compose.yml | 2 +- hopr-admin/Dockerfile | 4 ++-- package-lock.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 21ddb75..ecaa37b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,7 +54,7 @@ services: build: context: ./hopr-admin image: >- - europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.4 + europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.5 ports: - "3000:80" restart: unless-stopped diff --git a/hopr-admin/Dockerfile b/hopr-admin/Dockerfile index 2943806..26cafa7 100644 --- a/hopr-admin/Dockerfile +++ b/hopr-admin/Dockerfile @@ -1,3 +1,3 @@ -FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:stable +FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.5 -ENTRYPOINT ["nginx", "-g", "daemon off;"] \ No newline at end of file +ENTRYPOINT ["nginx", "-g", "daemon off;"] diff --git a/package-lock.json b/package-lock.json index 83395ba..a556438 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "hopr-dappnode", "devDependencies": { - "@dappnode/dappnodesdk": "^0.3.22" + "@dappnode/dappnodesdk": "^0.3.32" } }, "node_modules/@adraffy/ens-normalize": { From c89b7975467d9dbcecbad8b9b1f426f7409fa847 Mon Sep 17 00:00:00 2001 From: Jean Demeusy <61140535+jeandemeusy@users.noreply.github.com> Date: Tue, 27 Aug 2024 14:26:01 +0200 Subject: [PATCH 05/41] version correction --- docker-compose.yml | 2 +- hopr-admin/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index ecaa37b..0e9776f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,7 +54,7 @@ services: build: context: ./hopr-admin image: >- - europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.5 + europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.6 ports: - "3000:80" restart: unless-stopped diff --git a/hopr-admin/Dockerfile b/hopr-admin/Dockerfile index 26cafa7..77029fa 100644 --- a/hopr-admin/Dockerfile +++ b/hopr-admin/Dockerfile @@ -1,3 +1,3 @@ -FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.5 +FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.6 ENTRYPOINT ["nginx", "-g", "daemon off;"] From bcc07e17c3ef035b36053f9e07a25dfd969efa5b Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Tue, 1 Oct 2024 18:43:20 +0200 Subject: [PATCH 06/41] Send zulip notification (#142) * Update version 2.1.1 * Changed * adding log --- .github/workflows/release.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8b69ec..4574711 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,6 +11,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Build and publish to package repository + id: publish run: | npm install npx @dappnode/dappnodesdk publish patch \ @@ -21,6 +22,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 version is available. + - IPFS Hash: ${{ steps.publish.outputs.ipfs_hash }} + Access to your dAppNode and check for the updates \ No newline at end of file From e7c83590398c05f414b9981623fc75c96e5c2947 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Tue, 15 Oct 2024 23:02:24 +0200 Subject: [PATCH 07/41] Change hopr-admin port on 2.1.7 (#150) * Change hopr-admin port on 2.1.7 * update doc * specify network * Install docker-compose * add docker compose * use different version --- .github/workflows/main.yml | 12 +++++++++++- .github/workflows/release.yml | 14 ++++++++++++-- docker-compose.yml | 7 +++---- 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d31f024..dac25ce 100644 --- a/.github/workflows/main.yml +++ b/.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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4574711..ca7a937 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,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 publish to package repository id: publish run: | @@ -38,6 +48,6 @@ jobs: to: "Releases" topic: "main" content: | - A new hoprd dAppNode package version is available. + 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 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0e9776f..8bb0606 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,7 @@ version: "3.5" 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: @@ -54,9 +53,9 @@ services: build: context: ./hopr-admin image: >- - europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.6 + europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.6.1 ports: - - "3000:80" + - "3000:4677" restart: unless-stopped deploy: resources: From 6b2ec3700c2b0cc8917c24bb4b6102bb31963167 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Wed, 16 Oct 2024 00:09:45 +0200 Subject: [PATCH 08/41] Adapt config file changes --- hoprd.cfg.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/hoprd.cfg.yaml b/hoprd.cfg.yaml index f38f86c..8ca2693 100644 --- a/hoprd.cfg.yaml +++ b/hoprd.cfg.yaml @@ -1,5 +1,4 @@ --- - hopr: db: data: /app/hoprd-db/db @@ -31,12 +30,8 @@ hopr: backoff_min: 2.0 backoff_max: 300.0 protocol: - ack: - timeout: 15 heartbeat: timeout: 15 - msg: - timeout: 15 ticket_aggregation: timeout: 15 chain: From 6835a436c4474dc1c890ff8a4dcbe04c33b04d50 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Thu, 17 Oct 2024 10:12:51 +0200 Subject: [PATCH 09/41] Use the new URL in UI --- dappnode_package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dappnode_package.json b/dappnode_package.json index b973ba9..0161b3a 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -21,7 +21,7 @@ "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", + "api": "http://hopr.public.dappnode:3001/scalar", "docs": "https://docs.hoprnet.org" }, "repository": { From 518a1a4500b1111c0a2aedea3edf5a1b651c55c1 Mon Sep 17 00:00:00 2001 From: hopr-bot Date: Tue, 12 Nov 2024 13:41:23 +0000 Subject: [PATCH 10/41] Update to release 2.1.5 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8bb0606..69a1fc5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . args: UPSTREAM_VERSION: >- - 2.1.4@sha256:3618cdba157242264502bbda72b5a7fedc76d4895bb7d9f5a884a3baa9c625af + 2.1.5@sha256:ba5acd2ef4d85b1b3cb5f3245e12c2d6877ca7f404af4a42429f1f362a666846 ports: - "3001:3001/tcp" - "9091:9091/tcp" From b40158493cfbdb465433cad600b95290526ce5c4 Mon Sep 17 00:00:00 2001 From: Jean Demeusy <61140535+jeandemeusy@users.noreply.github.com> Date: Tue, 12 Nov 2024 15:43:08 +0100 Subject: [PATCH 11/41] set hopr-admin version to 2.1.10 --- docker-compose.yml | 2 +- hopr-admin/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 69a1fc5..0073c56 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,7 +53,7 @@ services: build: context: ./hopr-admin image: >- - europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.6.1 + europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.10 ports: - "3000:4677" restart: unless-stopped diff --git a/hopr-admin/Dockerfile b/hopr-admin/Dockerfile index 77029fa..b32612f 100644 --- a/hopr-admin/Dockerfile +++ b/hopr-admin/Dockerfile @@ -1,3 +1,3 @@ -FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.6 +FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.10 ENTRYPOINT ["nginx", "-g", "daemon off;"] From f74a1b4de3d13b10c234d9a9eadd655b9186b5af Mon Sep 17 00:00:00 2001 From: Jean Demeusy <61140535+jeandemeusy@users.noreply.github.com> Date: Tue, 12 Nov 2024 16:08:48 +0100 Subject: [PATCH 12/41] update quality thresholds --- hoprd.cfg.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hoprd.cfg.yaml b/hoprd.cfg.yaml index f38f86c..a6cc236 100644 --- a/hoprd.cfg.yaml +++ b/hoprd.cfg.yaml @@ -22,8 +22,8 @@ hopr: network_options: min_delay: 1 max_delay: 300 - quality_bad_threshold: 0.2 - quality_offline_threshold: 0.5 + quality_bad_threshold: 0.1 + quality_offline_threshold: 0.0 quality_step: 0.1 quality_avg_window_size: 25 ignore_timeframe: 600 From 461274fcd76c15d20bc18963fa46dcc2795fcfa0 Mon Sep 17 00:00:00 2001 From: Jean Demeusy <61140535+jeandemeusy@users.noreply.github.com> Date: Wed, 13 Nov 2024 11:33:54 +0100 Subject: [PATCH 13/41] update ui port --- dappnode_package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index b973ba9..bb523d1 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -20,7 +20,7 @@ ], "links": { "homepage": "https://hoprnet.org/", - "ui": "http://admin.hopr.public.dappnode/?apiEndpoint=http://hopr.public.dappnode:3001", + "ui": "http://admin.hopr.public.dappnode:4677/?apiEndpoint=http://hopr.public.dappnode:3001", "api": "http://hopr.public.dappnode:3001/swagger-ui/index.html", "docs": "https://docs.hoprnet.org" }, @@ -127,4 +127,4 @@ ] } ] -} +} \ No newline at end of file From c7eddc2cb83b9ee4eb4f6dd497a30a944d1da027 Mon Sep 17 00:00:00 2001 From: NumberFour8 Date: Tue, 7 Jan 2025 21:32:27 +0100 Subject: [PATCH 14/41] Enable Session port ranges --- docker-compose.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 0073c56..7adae6a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,6 +27,8 @@ 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" security_opt: @@ -42,6 +44,7 @@ services: HOPRD_HEARTBEAT_VARIANCE: 1 HOPRD_PASSWORD: "" HOPRD_PROVIDER: "" + HOPRD_SESSION_PORT_RANGE: "10000:10100" restart: unless-stopped deploy: resources: From b6206ddd7a79a7d08e83526397f375bf9d78446f Mon Sep 17 00:00:00 2001 From: NumberFour8 Date: Wed, 8 Jan 2025 10:04:10 +0100 Subject: [PATCH 15/41] Remove Dockerfile entrypoint to avoid overriding it --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2f79c09..a5c8611 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,3 @@ ENV DAPPNODE=true ADD hoprd.cfg.yaml /app/hoprd.cfg.yaml -ENTRYPOINT ["/bin/hoprd", "--configurationFilePath", "/app/hoprd.cfg.yaml"] From 855e7995c0e9f6e6e1b3844605a51fe81a5a8271 Mon Sep 17 00:00:00 2001 From: Andrius <73285987+Jaguaras@users.noreply.github.com> Date: Wed, 15 Jan 2025 00:55:46 +0200 Subject: [PATCH 16/41] improve config file (#154) - Added and enabled by default the necessary settings for a fast sync. - Removed the deprecated `on_close_redeem_single_tickets_value_min` setting. --- hoprd.cfg.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hoprd.cfg.yaml b/hoprd.cfg.yaml index 5a52f3a..0800096 100644 --- a/hoprd.cfg.yaml +++ b/hoprd.cfg.yaml @@ -14,7 +14,6 @@ hopr: 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" - !ClosureFinalizer max_closure_overdue: 3600 @@ -38,6 +37,8 @@ hopr: 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/ transport: From 5b55dc6c2f9a9d753e866f8826a01170dfe8eed4 Mon Sep 17 00:00:00 2001 From: HOPR Bot <68553210+hopr-bot@users.noreply.github.com> Date: Tue, 14 Jan 2025 23:56:18 +0100 Subject: [PATCH 17/41] Update to release 2.2.0-rc.1 (#155) Co-authored-by: ausias-armesto <29434949+ausias-armesto@users.noreply.github.com> Co-authored-by: ausias-armesto --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7adae6a..2adbbe2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . args: UPSTREAM_VERSION: >- - 2.1.5@sha256:ba5acd2ef4d85b1b3cb5f3245e12c2d6877ca7f404af4a42429f1f362a666846 + 2.2.0-rc.1@sha256:aac19ee348938eb096a79ad5b2a0224b76d665eb4d2b75731ed7a8a0c2cc7a12 ports: - "3001:3001/tcp" - "9091:9091/tcp" From 3a7e57cd8b8732046732f1acdedcf7b042a0d2a5 Mon Sep 17 00:00:00 2001 From: HOPR Bot <68553210+hopr-bot@users.noreply.github.com> Date: Wed, 15 Jan 2025 20:41:01 +0100 Subject: [PATCH 18/41] Update to release 2.2.0 (#156) * Update to release 2.2.0-rc.2 * Update tag --------- Co-authored-by: ausias-armesto <29434949+ausias-armesto@users.noreply.github.com> Co-authored-by: ausias-armesto --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2adbbe2..23d65bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . args: UPSTREAM_VERSION: >- - 2.2.0-rc.1@sha256:aac19ee348938eb096a79ad5b2a0224b76d665eb4d2b75731ed7a8a0c2cc7a12 + 2.2.0@sha256:77008574e73c387edf3c1c001b994117bf3cae2380851f81c195ceef3654d14e ports: - "3001:3001/tcp" - "9091:9091/tcp" @@ -56,7 +56,7 @@ services: build: context: ./hopr-admin image: >- - europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.10 + europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.13 ports: - "3000:4677" restart: unless-stopped From 6e9a940dd653e42caab66c7bf3b4272482da0864 Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 16 Jan 2025 16:15:12 +0100 Subject: [PATCH 19/41] Update upstream version in dappnode_package.json --- dappnode_package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dappnode_package.json b/dappnode_package.json index 72dc8ed..bd1aadd 100644 --- a/dappnode_package.json +++ b/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": [ @@ -127,4 +127,4 @@ ] } ] -} \ No newline at end of file +} From 354cfe14bee5f2b75ed62d86fe3bd00d34c1307f Mon Sep 17 00:00:00 2001 From: HOPR Bot <68553210+hopr-bot@users.noreply.github.com> Date: Tue, 28 Jan 2025 20:46:37 +0100 Subject: [PATCH 20/41] Update to release 2.2.1 (#158) * Update to release 2.2.1 * Update hopr-admin --------- Co-authored-by: ausias-armesto <29434949+ausias-armesto@users.noreply.github.com> Co-authored-by: ausias-armesto --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 23d65bb..f025ca3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . args: UPSTREAM_VERSION: >- - 2.2.0@sha256:77008574e73c387edf3c1c001b994117bf3cae2380851f81c195ceef3654d14e + 2.2.1@sha256:1ad1f5468917f5202c3dc8cf3e5ac5d5725a279c4bc85c3b9d84f2d2680a5dd0 ports: - "3001:3001/tcp" - "9091:9091/tcp" @@ -56,7 +56,7 @@ services: build: context: ./hopr-admin image: >- - europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.13 + europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.14 ports: - "3000:4677" restart: unless-stopped From 7d3697a797bc1afe131ad37b15df981d2a67a3e6 Mon Sep 17 00:00:00 2001 From: NumberFour8 Date: Thu, 6 Feb 2025 10:18:06 +0100 Subject: [PATCH 21/41] Add GnosisVPN session port --- dappnode_package.json | 6 ++++++ docker-compose.yml | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dappnode_package.json b/dappnode_package.json index bd1aadd..c618499 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -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)", diff --git a/docker-compose.yml b/docker-compose.yml index f025ca3..5b47926 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,8 @@ services: UPSTREAM_VERSION: >- 2.2.1@sha256:1ad1f5468917f5202c3dc8cf3e5ac5d5725a279c4bc85c3b9d84f2d2680a5dd0 ports: + - "1422:1422/udp" + - "1422:1422/tcp" - "3001:3001/tcp" - "9091:9091/tcp" - "9091:9091/udp" From 39b2aa93186630e1051f9c13fd9221efd72bc3c4 Mon Sep 17 00:00:00 2001 From: NumberFour8 Date: Thu, 6 Feb 2025 10:24:21 +0100 Subject: [PATCH 22/41] Update config file defaults --- hoprd.cfg.yaml | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/hoprd.cfg.yaml b/hoprd.cfg.yaml index 0800096..a3415e5 100644 --- a/hoprd.cfg.yaml +++ b/hoprd.cfg.yaml @@ -9,25 +9,14 @@ hopr: allow_recursive: true strategies: - !Aggregating - aggregation_threshold: 100 + aggregation_threshold: 1000 unrealized_balance_ratio: 0.9 aggregate_on_channel_close: true - !AutoRedeeming redeem_only_aggregated: true - minimum_redeem_ticket_value: "30000000000000000000 HOPR" + minimum_redeem_ticket_value: "25000000000000000000 HOPR" - !ClosureFinalizer - max_closure_overdue: 3600 - network_options: - min_delay: 1 - max_delay: 300 - quality_bad_threshold: 0.1 - quality_offline_threshold: 0.0 - 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: heartbeat: timeout: 15 @@ -35,7 +24,6 @@ hopr: timeout: 15 chain: announce: true - check_unrealized_balance: true network: dufour keep_logs: true fast_sync: true @@ -51,8 +39,3 @@ api: host: address: !IPv4 0.0.0.0 port: 3001 -inbox: - capacity: 512 - max_age: 900 - excluded_tags: - - 0 From 1c3db0db98c3bf900b071c9cc32b406b35c56827 Mon Sep 17 00:00:00 2001 From: NumberFour8 Date: Thu, 6 Feb 2025 12:01:28 +0100 Subject: [PATCH 23/41] Make target allowlist empty per default --- hoprd.cfg.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hoprd.cfg.yaml b/hoprd.cfg.yaml index a3415e5..e0b32ab 100644 --- a/hoprd.cfg.yaml +++ b/hoprd.cfg.yaml @@ -39,3 +39,6 @@ api: host: address: !IPv4 0.0.0.0 port: 3001 +session_ip_forwarding: + target_allow_list: [] + From 40af7fca701397f5d65a341cdc9ddb401fdf5709 Mon Sep 17 00:00:00 2001 From: Teebor-Choka <9529609+Teebor-Choka@users.noreply.github.com> Date: Fri, 7 Feb 2025 14:15:34 +0000 Subject: [PATCH 24/41] Update to release 2.2.2 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5b47926..692bf94 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ services: context: . args: UPSTREAM_VERSION: >- - 2.2.1@sha256:1ad1f5468917f5202c3dc8cf3e5ac5d5725a279c4bc85c3b9d84f2d2680a5dd0 + 2.2.2@sha256:27a8dce397e2d3c5b2b69b4a8967611993a4b6f01b2e167da629418d96880a64 ports: - "1422:1422/udp" - "1422:1422/tcp" From cf1c55a22734ae03774c6c9aa66f19c3560d5ed6 Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 17 Feb 2025 20:14:08 +0100 Subject: [PATCH 25/41] Update hopr-admin to 2.1.14 Updates HOPR Admin version to 2.1.14 --- hopr-admin/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hopr-admin/Dockerfile b/hopr-admin/Dockerfile index b32612f..d3a347a 100644 --- a/hopr-admin/Dockerfile +++ b/hopr-admin/Dockerfile @@ -1,3 +1,3 @@ -FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.10 +FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hopr-admin:2.1.14 ENTRYPOINT ["nginx", "-g", "daemon off;"] From 6d62b606b574c9b81b9975fab021457500449ded Mon Sep 17 00:00:00 2001 From: Tibor <9529609+Teebor-Choka@users.noreply.github.com> Date: Tue, 18 Feb 2025 09:20:00 +0100 Subject: [PATCH 26/41] strategy: Update hoprd.cfg.yaml to match values to hoprd defaults --- hoprd.cfg.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hoprd.cfg.yaml b/hoprd.cfg.yaml index e0b32ab..5f5b4f6 100644 --- a/hoprd.cfg.yaml +++ b/hoprd.cfg.yaml @@ -9,12 +9,12 @@ hopr: allow_recursive: true strategies: - !Aggregating - aggregation_threshold: 1000 + aggregation_threshold: 250 unrealized_balance_ratio: 0.9 aggregate_on_channel_close: true - !AutoRedeeming redeem_only_aggregated: true - minimum_redeem_ticket_value: "25000000000000000000 HOPR" + minimum_redeem_ticket_value: "2500000000000000000 HOPR" - !ClosureFinalizer max_closure_overdue: 300 protocol: From 9b39a18eae5b73177cdacf9a8426cec7c1e77943 Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Thu, 20 Feb 2025 10:55:27 +0100 Subject: [PATCH 27/41] Add more configuration options --- Dockerfile | 1 - docker-compose.yml | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index a5c8611..d531271 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,4 +5,3 @@ FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hoprd:${UPSTREAM_ ENV DAPPNODE=true ADD hoprd.cfg.yaml /app/hoprd.cfg.yaml - diff --git a/docker-compose.yml b/docker-compose.yml index 692bf94..a2c324c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,8 +5,13 @@ services: 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 + # using 2.2.3 pre-release version UPSTREAM_VERSION: >- - 2.2.2@sha256:27a8dce397e2d3c5b2b69b4a8967611993a4b6f01b2e167da629418d96880a64 + 2.2.3-pr.6875@sha256:79815e01b1c984cef677cc9eeed18bb2119c6998559df63fdc87785c336f22c7 + # overwrite the entrypoint to allow for additional environment variables + entrypoint: [] + command: /bin/sh -c 'env $$ADDITIONAL_ENVIRONMENT_VARS /bin/docker-entrypoint.sh $$ADDITIONAL_CMDLINE_ARGS' ports: - "1422:1422/udp" - "1422:1422/tcp" @@ -41,12 +46,13 @@ services: 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 + ADDITIONAL_CMDLINE_ARGS: "" + ADDITIONAL_ENVIRONMENT_VARS: "" restart: unless-stopped deploy: resources: From 1929d3bf226bc3b1da309802896754774a5689d7 Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Thu, 20 Feb 2025 11:18:37 +0100 Subject: [PATCH 28/41] Add custom entrypoint script --- Dockerfile | 5 +++++ entrypoint.sh | 3 +++ 2 files changed, 8 insertions(+) create mode 100755 entrypoint.sh diff --git a/Dockerfile b/Dockerfile index d531271..18680e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,3 +5,8 @@ FROM europe-west3-docker.pkg.dev/hoprassociation/docker-images/hoprd:${UPSTREAM_ ENV DAPPNODE=true ADD hoprd.cfg.yaml /app/hoprd.cfg.yaml +ADD entrypoint.sh /bin/entrypoint.sh + +RUN chmod +rx /bin/entrypoint.sh + +ENTRYPOINT ["/bin/entrypoint.sh"] diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100755 index 0000000..7fd3a4c --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec env ${ADDITIONAL_ENVIRONMENT_VARS} /bin/docker-entrypoint.sh ${ADDITIONAL_CMDLINE_ARGS} From e5dd128df8bfff4d016fec9c3ef6a2341f8c64b9 Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Thu, 20 Feb 2025 14:31:08 +0100 Subject: [PATCH 29/41] Update to fixed docker version --- docker-compose.yml | 5 +---- entrypoint.sh | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a2c324c..c1176f6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,10 +8,7 @@ services: # see https://console.cloud.google.com/artifacts/docker/hoprassociation/europe-west3/docker-images/hoprd?inv=1&invt=AbqEGg&project=hoprassociation&pli=1 # using 2.2.3 pre-release version UPSTREAM_VERSION: >- - 2.2.3-pr.6875@sha256:79815e01b1c984cef677cc9eeed18bb2119c6998559df63fdc87785c336f22c7 - # overwrite the entrypoint to allow for additional environment variables - entrypoint: [] - command: /bin/sh -c 'env $$ADDITIONAL_ENVIRONMENT_VARS /bin/docker-entrypoint.sh $$ADDITIONAL_CMDLINE_ARGS' + 2.2.3-pr.6884@sha256:5e27190b3dd6debc76776f52dc689bc5fd99abb10c4eb31c8e64e3e6f5bfa8b5 ports: - "1422:1422/udp" - "1422:1422/tcp" diff --git a/entrypoint.sh b/entrypoint.sh index 7fd3a4c..3c9a90e 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,3 +1,3 @@ -#!/bin/sh +#!/bin/bash -exec env ${ADDITIONAL_ENVIRONMENT_VARS} /bin/docker-entrypoint.sh ${ADDITIONAL_CMDLINE_ARGS} +env ${ADDITIONAL_ENVIRONMENT_VARS} /bin/docker-entrypoint.sh ${ADDITIONAL_CMDLINE_ARGS} From be7cd7596eaca5670851cca593e1f46dcb5028b8 Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Fri, 28 Mar 2025 09:22:47 +0100 Subject: [PATCH 30/41] env: Add support for HOPRD_NAT --- setup-wizard.yml | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/setup-wizard.yml b/setup-wizard.yml index 77e2220..781e1bd 100644 --- a/setup-wizard.yml +++ b/setup-wizard.yml @@ -35,12 +35,32 @@ fields: title: RPC Provider URL required: false description: |- - URL to the custom RPC provider this HOPR node should use. + URL to the custom RPC provider this HOPR node should use. Supports simple query strings. If your DAppnode is running a Gnosis Chain RPC endpoint, it is **strongly recommended** to use it here. *Example:* `http://nethermind-xdai.dappnode:8545` secret: false - pattern: "^http[s]{0,1}://[a-z0-9.-]{3,}(:[0-9]{2,5})?(/[a-z0-9.-/_]+)?$" + # Regular expression for matching URLs with simple query strings + # + # Components: + # - ^http[s]{0,1}:// : Matches HTTP or HTTPS protocol + # Examples: http://, https:// + # + # - [a-z0-9.-]{3,} : Matches domain name (min 3 chars) + # Allows: lowercase letters, numbers, dots, hyphens + # Examples: example.com, sub.example.com, my-domain.com + # + # - (:[0-9]{2,5})? : Optional port number (10-99999) + # Examples: :80, :8080, :44300 + # + # - (/[a-z0-9.-/_]+)? : Optional URL path + # Allows: slashes, lowercase letters, numbers, dots, hyphens, underscores + # Examples: /path, /path/to/resource, /api/v1/endpoint + # + # - (\?[a-z0-9._=&-]+)? : Optional query string + # Allows: lowercase letters, numbers, dots, underscores, equals signs, ampersands, hyphens + # Examples: ?param=value, ?id=123&type=test, ?user.name=john_doe + pattern: "^http[s]{0,1}://[a-z0-9.-]{3,}(:[0-9]{2,5})?(/[a-z0-9.-/_]+)?(\?[a-z0-9._=&-]+)?$" patternErrorMessage: Must be a valid url starting with `http://` or `https://` # - id: IDENTITY @@ -119,3 +139,18 @@ fields: secret: false pattern: "^[a-z0-9.-]{3,}:909[1-9]$" patternErrorMessage: Must be in correct host:port format! + + - id: HOPRD_NAT + target: + type: environment + name: HOPRD_NAT + service: node + title: Enable NAT mode + required: false + description: |- + By default the HOPR node assumes that it is running behind a NAT on a + dappnode. If this is not the case or proper port forwarding has been + set up this option can be set to `false` to disable NAT mode. + secret: false + pattern: "^(true|false)$" + patternErrorMessage: Must be either `true` or `false`! From 96fa84bbf5b69591670c1182e937e4ac275d82cd Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Fri, 28 Mar 2025 09:40:08 +0100 Subject: [PATCH 31/41] Fix regex parsing in yaml file --- justfile | 3 +++ package-lock.json | 46 ++++++++++++++++++++++++++++------------------ package.json | 2 +- setup-wizard.yml | 12 ++++++------ shell.nix | 1 + 5 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 justfile diff --git a/justfile b/justfile new file mode 100644 index 0000000..ca5f078 --- /dev/null +++ b/justfile @@ -0,0 +1,3 @@ +# build the dappnode package +build: + npx @dappnode/dappnodesdk build diff --git a/package-lock.json b/package-lock.json index a556438..d7e4b58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "hopr-dappnode", "devDependencies": { - "@dappnode/dappnodesdk": "^0.3.32" + "@dappnode/dappnodesdk": "^0.3.38" } }, "node_modules/@adraffy/ens-normalize": { @@ -37,14 +37,14 @@ } }, "node_modules/@dappnode/dappnodesdk": { - "version": "0.3.32", - "resolved": "https://registry.npmjs.org/@dappnode/dappnodesdk/-/dappnodesdk-0.3.32.tgz", - "integrity": "sha512-5OptK4bzsBeA616l07zwNsZANTJMnXs1GA6hGsyke+WvtNUVd4MZAnyQ0RlfhUk9G5rVqwAhHzOW6IRTuPWCFg==", + "version": "0.3.38", + "resolved": "https://registry.npmjs.org/@dappnode/dappnodesdk/-/dappnodesdk-0.3.38.tgz", + "integrity": "sha512-S0JiqblEyLJ0Idp4lEyezUKN0DWUbdKoN1MFcZaN2zf1ZRctcihPyUAarns3B0arOg5XiRpqutA+TzEKLvMvJg==", "dev": true, "dependencies": { - "@dappnode/schemas": "^0.1.21", + "@dappnode/schemas": "^0.1.23", "@dappnode/toolkit": "^0.1.21", - "@dappnode/types": "^0.1.39", + "@dappnode/types": "^0.1.40", "@octokit/rest": "^20.1.1", "async-retry": "^1.2.3", "chalk": "^2.4.2", @@ -76,16 +76,16 @@ "dappnodesdk": "dist/dappnodesdk.js" }, "engines": { - "node": ">=18.0.0" + "node": ">=20.0.0" } }, "node_modules/@dappnode/schemas": { - "version": "0.1.21", - "resolved": "https://registry.npmjs.org/@dappnode/schemas/-/schemas-0.1.21.tgz", - "integrity": "sha512-CEuSZfuFzvZw+HE56x+PJtbvg6Z06iF1OzhyyTNMvtzpIO8giir+dtKx8BvgBWc5rYCPTsa3ryhJg8VARC+jnA==", + "version": "0.1.23", + "resolved": "https://registry.npmjs.org/@dappnode/schemas/-/schemas-0.1.23.tgz", + "integrity": "sha512-EOxo3gQzfl+uPDO4geC4211LyNEmzEtObPk3wOgq/cp/2+JftZdiMIUn3sOehs9QU/Z4iwsPr8tVlDELXV09/Q==", "dev": true, "dependencies": { - "@dappnode/types": "^0.1.38", + "@dappnode/types": "^0.1.40", "ajv": "^8.12.0", "semver": "^7.5.0" } @@ -190,9 +190,9 @@ } }, "node_modules/@dappnode/types": { - "version": "0.1.39", - "resolved": "https://registry.npmjs.org/@dappnode/types/-/types-0.1.39.tgz", - "integrity": "sha512-HekCz9O24km0FfAr3yzIq9j8TqCshY3+UD3+ee0SKwj/Iq5QYV0I4gH4EL2U8w7Mwgu2T8tJUzmTbG1c05giEw==", + "version": "0.1.40", + "resolved": "https://registry.npmjs.org/@dappnode/types/-/types-0.1.40.tgz", + "integrity": "sha512-gq0PswPB4y09SLpK+MYJti841/jcFTjqoVT+rcrwvOsSEFk6KUyCLxLahFKUJ9Z5w5iBiSLeJ1kmNQk/PRvT9Q==", "dev": true }, "node_modules/@fastify/busboy": { @@ -1927,10 +1927,20 @@ "dev": true }, "node_modules/fast-uri": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", - "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", - "dev": true + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz", + "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ] }, "node_modules/figlet": { "version": "1.7.0", diff --git a/package.json b/package.json index 782998c..dc5c504 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,6 @@ "repository": "https://github.com/dappnode/DAppNodePackage-Hopr", "private": true, "devDependencies": { - "@dappnode/dappnodesdk": "^0.3.32" + "@dappnode/dappnodesdk": "^0.3.38" } } diff --git a/setup-wizard.yml b/setup-wizard.yml index 781e1bd..44bd481 100644 --- a/setup-wizard.yml +++ b/setup-wizard.yml @@ -7,7 +7,7 @@ fields: service: node title: Identity file password required: true - pattern: "[^\\s]{10,}" + pattern: ^[^\\s]{10,}$ patternErrorMessage: Must be at least 10 characters long! description: >- Password used to protect the new or existing identity file. @@ -60,7 +60,7 @@ fields: # - (\?[a-z0-9._=&-]+)? : Optional query string # Allows: lowercase letters, numbers, dots, underscores, equals signs, ampersands, hyphens # Examples: ?param=value, ?id=123&type=test, ?user.name=john_doe - pattern: "^http[s]{0,1}://[a-z0-9.-]{3,}(:[0-9]{2,5})?(/[a-z0-9.-/_]+)?(\?[a-z0-9._=&-]+)?$" + pattern: ^http[s]{0,1}://[a-z0-9.-]{3,}(:[0-9]{2,5})?(/[a-z0-9.-/_]+)?(\?[a-z0-9._=&-]+)?$ patternErrorMessage: Must be a valid url starting with `http://` or `https://` # - id: IDENTITY @@ -97,7 +97,7 @@ fields: *Example:* `0x010203040506070809aabbccddeeff00112233` secret: false - pattern: "^0x[a-fA-F0-9]{40}$" + pattern: ^0x[a-fA-F0-9]{40}$ patternErrorMessage: Must be a valid Ethereum address! - id: HOPRD_MODULE_ADDRESS @@ -114,7 +114,7 @@ fields: *Example:* `0x010203040506070809aabbccddeeff00112233` secret: false - pattern: "^0x[a-fA-F0-9]{40}$" + pattern: ^0x[a-fA-F0-9]{40}$ patternErrorMessage: Must be a valid Ethereum address! - id: HOPRD_HOST @@ -137,7 +137,7 @@ fields: *Example (dynDNS entry):* `abcd1234.dyndns.dappnode.io:9091` secret: false - pattern: "^[a-z0-9.-]{3,}:909[1-9]$" + pattern: ^[a-z0-9.-]{3,}:909[1-9]$ patternErrorMessage: Must be in correct host:port format! - id: HOPRD_NAT @@ -152,5 +152,5 @@ fields: dappnode. If this is not the case or proper port forwarding has been set up this option can be set to `false` to disable NAT mode. secret: false - pattern: "^(true|false)$" + pattern: ^(true|false)$ patternErrorMessage: Must be either `true` or `false`! diff --git a/shell.nix b/shell.nix index 1d9d110..77b8279 100644 --- a/shell.nix +++ b/shell.nix @@ -18,6 +18,7 @@ mkShell { envsubst # build utils + just nodejs_20 # custom pkg groups From 29d1f32698d195cb9c62868112a1ff9ed9219a67 Mon Sep 17 00:00:00 2001 From: hopr-bot <68553210+hopr-bot@users.noreply.github.com> Date: Fri, 28 Mar 2025 12:37:19 +0000 Subject: [PATCH 32/41] Update to release 2.2.3 --- docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index c1176f6..b4a79d4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,9 @@ services: # see https://console.cloud.google.com/artifacts/docker/hoprassociation/europe-west3/docker-images/hoprd?inv=1&invt=AbqEGg&project=hoprassociation&pli=1 # using 2.2.3 pre-release version UPSTREAM_VERSION: >- - 2.2.3-pr.6884@sha256:5e27190b3dd6debc76776f52dc689bc5fd99abb10c4eb31c8e64e3e6f5bfa8b5 + 2.2.3@sha256:cad18ea69128bc9ae3c43fd776d172978c767eb51a2a001a9d410bb924c7bd51 + + 2.2.3-commit.26d252c3@sha256:3a1d61ef9ccfe6142af3c9c38c27ab7b6f9c30440343110cf9d6dff53265bee5 ports: - "1422:1422/udp" - "1422:1422/tcp" From ab59c6a9a4978965e41e2caa93e49ec040785caf Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Fri, 28 Mar 2025 13:45:29 +0100 Subject: [PATCH 33/41] Fix version --- docker-compose.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b4a79d4..22d537e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: "3.5" services: node: # Do not set image field here, it will be set automatically by the sdk. @@ -6,11 +5,8 @@ services: context: . args: # see https://console.cloud.google.com/artifacts/docker/hoprassociation/europe-west3/docker-images/hoprd?inv=1&invt=AbqEGg&project=hoprassociation&pli=1 - # using 2.2.3 pre-release version UPSTREAM_VERSION: >- 2.2.3@sha256:cad18ea69128bc9ae3c43fd776d172978c767eb51a2a001a9d410bb924c7bd51 - - 2.2.3-commit.26d252c3@sha256:3a1d61ef9ccfe6142af3c9c38c27ab7b6f9c30440343110cf9d6dff53265bee5 ports: - "1422:1422/udp" - "1422:1422/tcp" @@ -50,6 +46,7 @@ services: 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 From 0b80e2fb85c09191ab9db14ab7f84dc37221ec5e Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Fri, 28 Mar 2025 14:00:10 +0100 Subject: [PATCH 34/41] Use compose v3 --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 22d537e..1e7b05b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,4 @@ +version: 3 services: node: # Do not set image field here, it will be set automatically by the sdk. From 184e873764c8601dffeb5f33f6d5432657863ce0 Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Fri, 28 Mar 2025 14:06:28 +0100 Subject: [PATCH 35/41] Make compose version a string --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1e7b05b..0bab097 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: 3 +version: "3" services: node: # Do not set image field here, it will be set automatically by the sdk. From 0f537b069651c35d9ee29335437c8c5faf979daf Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Fri, 28 Mar 2025 14:10:57 +0100 Subject: [PATCH 36/41] Bump docker compose version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0bab097..0e49b98 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: "3.6" services: node: # Do not set image field here, it will be set automatically by the sdk. From 1dab324e74a74925107e4665fcaa81f4d0d15abc Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Fri, 28 Mar 2025 22:44:30 +0100 Subject: [PATCH 37/41] Revert id password regex change --- setup-wizard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-wizard.yml b/setup-wizard.yml index 44bd481..c5d4595 100644 --- a/setup-wizard.yml +++ b/setup-wizard.yml @@ -7,7 +7,7 @@ fields: service: node title: Identity file password required: true - pattern: ^[^\\s]{10,}$ + pattern: [^\\s]{10,} patternErrorMessage: Must be at least 10 characters long! description: >- Password used to protect the new or existing identity file. From 1b4cfbfad7f5d2be3b1886401ec5e46f9041e148 Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Fri, 28 Mar 2025 22:46:26 +0100 Subject: [PATCH 38/41] Proper revert --- setup-wizard.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup-wizard.yml b/setup-wizard.yml index c5d4595..543153a 100644 --- a/setup-wizard.yml +++ b/setup-wizard.yml @@ -7,7 +7,7 @@ fields: service: node title: Identity file password required: true - pattern: [^\\s]{10,} + pattern: "[^\\s]{10,}" patternErrorMessage: Must be at least 10 characters long! description: >- Password used to protect the new or existing identity file. From c76338c3abbab7bf13e2e104182e34a733f37a63 Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Sat, 29 Mar 2025 20:22:35 +0100 Subject: [PATCH 39/41] Fix URL regex pattern --- setup-wizard.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup-wizard.yml b/setup-wizard.yml index 543153a..bc90c4d 100644 --- a/setup-wizard.yml +++ b/setup-wizard.yml @@ -53,14 +53,14 @@ fields: # - (:[0-9]{2,5})? : Optional port number (10-99999) # Examples: :80, :8080, :44300 # - # - (/[a-z0-9.-/_]+)? : Optional URL path + # - (/[a-z0-9.-/_]*)? : Optional URL path # Allows: slashes, lowercase letters, numbers, dots, hyphens, underscores # Examples: /path, /path/to/resource, /api/v1/endpoint # - # - (\?[a-z0-9._=&-]+)? : Optional query string + # - (\?[a-z0-9._=&-]*)? : Optional query string # Allows: lowercase letters, numbers, dots, underscores, equals signs, ampersands, hyphens # Examples: ?param=value, ?id=123&type=test, ?user.name=john_doe - pattern: ^http[s]{0,1}://[a-z0-9.-]{3,}(:[0-9]{2,5})?(/[a-z0-9.-/_]+)?(\?[a-z0-9._=&-]+)?$ + pattern: ^http[s]{0,1}:\/\/[a-z0-9.-]{3,}(:[0-9]{2,5})?(\/[a-z0-9.-/_]*)?(\?[a-z0-9._=&-]*)?$ patternErrorMessage: Must be a valid url starting with `http://` or `https://` # - id: IDENTITY From a7fba2a5f40cf34a69194d9cec2287683d623612 Mon Sep 17 00:00:00 2001 From: ausias-armesto Date: Wed, 2 Apr 2025 12:18:41 +0200 Subject: [PATCH 40/41] Rename folders --- Dockerfile | 2 +- dappnode_package.json | 10 +++------- docker-compose.yml | 8 +++++--- hoprd.cfg.yaml | 6 +++--- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 18680e3..602675c 100644 --- a/Dockerfile +++ b/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 diff --git a/dappnode_package.json b/dappnode_package.json index c618499..58088e2 100644 --- a/dappnode_package.json +++ b/dappnode_package.json @@ -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": [ diff --git a/docker-compose.yml b/docker-compose.yml index 0e49b98..d17bc4b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 @@ -70,4 +71,5 @@ services: limits: memory: 256M volumes: - db: {} + data: {} + conf: {} diff --git a/hoprd.cfg.yaml b/hoprd.cfg.yaml index 5f5b4f6..5ce1592 100644 --- a/hoprd.cfg.yaml +++ b/hoprd.cfg.yaml @@ -1,7 +1,7 @@ --- hopr: db: - data: /app/hoprd-db/db + data: /app/hoprd/data initialize: true force_initialize: false strategy: @@ -28,12 +28,12 @@ hopr: 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: From 707c46d3b6160dcfc2cc697d4164fcf76490efa1 Mon Sep 17 00:00:00 2001 From: Andrius <73285987+Jaguaras@users.noreply.github.com> Date: Wed, 4 Jun 2025 11:50:48 +0300 Subject: [PATCH 41/41] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index d17bc4b..f202efd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -62,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:2.2.0 ports: - "3000:4677" restart: unless-stopped