From 6bb24ed8d80926fc97c7b12037d48929adbc9762 Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Tue, 4 Jun 2024 13:00:15 +0200 Subject: [PATCH] Pin network to dufour --- .github/workflows/auto_check.yml | 20 ------------------- .github/workflows/main.yml | 33 ++++++++++++-------------------- .github/workflows/release.yml | 26 +++++++++++++++++++++++++ DEVELOPING.md | 8 ++++---- README.md | 6 ------ docker-compose.yml | 1 - hoprd.cfg.yaml | 1 + setup-wizard.yml | 10 ---------- 8 files changed, 43 insertions(+), 62 deletions(-) delete mode 100644 .github/workflows/auto_check.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/auto_check.yml b/.github/workflows/auto_check.yml deleted file mode 100644 index 08ea40e..0000000 --- a/.github/workflows/auto_check.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Bump upstream version - -on: - schedule: - - cron: "00 */4 * * *" - push: - branches: - - "master" - - "main" - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - run: npx @dappnode/dappnodesdk github-action bump-upstream - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - PINATA_API_KEY: ${{ secrets.PINATA_API_KEY }} - PINATA_SECRET_API_KEY: ${{ secrets.PINATA_SECRET_API_KEY }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8ce35a1..d31f024 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,31 +1,22 @@ -name: "Main" +name: Build (experimental package) + on: pull_request: push: - paths-ignore: - - "README.md" + branches: + - develop jobs: - build-test: - runs-on: ubuntu-latest - name: Build test - steps: - - uses: actions/checkout@v2 - - run: | - npm install - npx @dappnode/dappnodesdk build --skip_save - - release: - name: Release + build: runs-on: ubuntu-latest - needs: build-test steps: - - uses: actions/checkout@v2 - - name: Publish + - uses: actions/checkout@v4 + - name: Build and upload to IPFS run: | npm install - npx @dappnode/dappnodesdk publish patch --dappnode_team_preset - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - DEVELOPER_ADDRESS: "0x7305356ad936A06c4ea5DF45AD5E5C3ff9Db818E" + npx @dappnode/dappnodesdk build \ + --provider "remote" \ + --verbose | tee build.log + echo "DNP (DAppNode Package) built and uploaded" >> $GITHUB_STEP_SUMMARY + grep "ipfs" build.log >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..a8b69ec --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,26 @@ +name: Build (release package) + +on: + push: + branches: + - main + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Build and publish to package repository + run: | + npm install + npx @dappnode/dappnodesdk publish patch \ + --provider "remote" \ + --upload_to "ipfs" \ + --verbose \ + --github_release | tee build.log + + echo "DNP (DAppNode Package) built and uploaded" >> $GITHUB_STEP_SUMMARY + grep "ipfs" build.log >> $GITHUB_STEP_SUMMARY + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + DEVELOPER_ADDRESS: "0x7305356ad936A06c4ea5DF45AD5E5C3ff9Db818E" diff --git a/DEVELOPING.md b/DEVELOPING.md index 3216aac..2b1a378 100644 --- a/DEVELOPING.md +++ b/DEVELOPING.md @@ -1,18 +1,18 @@ # Repository structure -There are two repositories: +There are three repositories: - official: https://github.com/dappnode/DAppNodePackage-Hopr - internal: https://github.com/hoprnet/DAppNodePackage-Hopr +- testnet: https://github.com/dappnode/DAppNodePackage-Hopr-Testnet -The `internal` is a fork of the `official` one. +The `internal` is a fork of the `official` one. The `testnet` repo is configured specifically to use our `rotsee` testnet Tha development happens on the internal repository and it has two branches: - `develop` which contains the edge version, not meant for publishing - `main` which is supposed to be in-sync with the `main` branch on the `official` repo - PRs are only meant to be made from the `internal` repo's `main` branch to the `official` repo's `main` branch. # Development process @@ -69,4 +69,4 @@ When running with the [DMS package](http://my.dappnode/installer/dnp/dms.dnp.dap - [http://prometheus.dms.dappnode:9090/targets](http://prometheus.dms.dappnode:9090/targets) lists Prometheus targets. Make sure the package's target is available -Automatic import of Prometheus targets is only available if `prometheusTargets` and automatic import of Grafana dashboards is only available if `grafanaDashboards` is present in the observed [package manifest](http://my.dappnode/package-manifest/hopr.public.dappnode.eth). \ No newline at end of file +Automatic import of Prometheus targets is only available if `prometheusTargets` and automatic import of Grafana dashboards is only available if `grafanaDashboards` is present in the observed [package manifest](http://my.dappnode/package-manifest/hopr.public.dappnode.eth). diff --git a/README.md b/README.md index f8ad2fd..ff87e4c 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,3 @@ This is the DAppNode package for HOPR. You can download this to install the HOPR ## Getting Started To install HOPR follow the instructions [here.](https://docs.hoprnet.org/node/using-dappnode) - -## Versions - -Hopr Admin: v1.1.7 - -Hoprd: v2.1.0 diff --git a/docker-compose.yml b/docker-compose.yml index d1f0ab2..4523bb6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,6 @@ services: - "seccomp:unconfined" environment: RUST_LOG: info - HOPRD_NETWORK: dufour HOPRD_CONFIGURATION_FILE_PATH: /app/hoprd.cfg.yaml HOPRD_HOST: "127.0.0.1:9091" HOPRD_SAFE_ADDRESS: 0x diff --git a/hoprd.cfg.yaml b/hoprd.cfg.yaml index 3a8cfbc..e12d797 100644 --- a/hoprd.cfg.yaml +++ b/hoprd.cfg.yaml @@ -41,6 +41,7 @@ hopr: chain: announce: true check_unrealized_balance: true + network: dufour safe_module: safe_transaction_service_provider: https://safe-transaction.prod.hoprtech.net/ transport: diff --git a/setup-wizard.yml b/setup-wizard.yml index 1233e0a..77e2220 100644 --- a/setup-wizard.yml +++ b/setup-wizard.yml @@ -43,16 +43,6 @@ fields: pattern: "^http[s]{0,1}://[a-z0-9.-]{3,}(:[0-9]{2,5})?(/[a-z0-9.-/_]+)?$" patternErrorMessage: Must be a valid url starting with `http://` or `https://` - - id: HOPRD_NETWORK - target: - type: environment - name: HOPRD_NETWORK - service: node - title: HOPR network name - required: false - description: Optional HOPR network environment this HOPR node should use. - secret: false - # - id: IDENTITY # target: # type: fileUpload