Merge dev -> master

.github/workflows/publish.yml

@@ -21,9 +21,6 @@ env:
 jobs:
   docker:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        network: ["mainnet" , "zen"]
     permissions:
       packages: write
     steps:
@@ -35,31 +32,18 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Prepare environment variables
-        run: |
-          if [[ "${{ matrix.network }}" == "zen" ]]; then
-            echo "BUILD_TAGS=testnet netgo" >> $GITHUB_ENV
-            echo "DOCKER_METADATA_SUFFIX=-zen" >> $GITHUB_ENV
-          else
-            echo "BUILD_TAGS=netgo" >> $GITHUB_ENV
-            echo "DOCKER_METADATA_SUFFIX=" >> $GITHUB_ENV
-          fi
       - uses: docker/metadata-action@v4
         name: Generate tags
         id: meta
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          flavor: |
-            suffix=${{ env.DOCKER_METADATA_SUFFIX }},onlatest=true
           tags: |
             type=ref,event=branch
             type=sha,prefix=
             type=semver,pattern={{version}}
       - uses: docker/build-push-action@v4
         with:
           context: .
-          build-args: |
-            BUILD_TAGS=${{ env.BUILD_TAGS }}
           file: ./docker/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
@@ -68,7 +52,6 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        network: ["mainnet" , "zen"]
         arch: [ amd64, arm64 ]
     steps:
       - uses: actions/checkout@v4
@@ -83,53 +66,25 @@ jobs:
             sudo apt install -y gcc-aarch64-linux-gnu
             echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
           fi
-      - name: Set build tag environment variable
-        run: |
-          if [[ "${{ matrix.network }}" == "zen" ]]; then
-            echo "BUILD_TAGS=testnet netgo" >> $GITHUB_ENV
-            echo "ZIP_OUTPUT_SUFFIX=_zen" >> $GITHUB_ENV
-          else
-            echo "BUILD_TAGS=netgo" >> $GITHUB_ENV
-            echo "ZIP_OUTPUT_SUFFIX=" >> $GITHUB_ENV
-          fi
       - name: Build ${{ matrix.arch }}
         env:
           CGO_ENABLED: 1
           GOOS: linux
           GOARCH: ${{ matrix.arch }}
         run: |
           mkdir -p release
-          ZIP_OUTPUT=release/renterd${{ env.ZIP_OUTPUT_SUFFIX }}_${GOOS}_${GOARCH}.zip
-          go build -tags="$BUILD_TAGS" -trimpath -o bin/ -a -ldflags '-s -w -linkmode external -extldflags "-static"' ./cmd/renterd
+          ZIP_OUTPUT=release/renterd_${GOOS}_${GOARCH}.zip
+          go build -trimpath -o bin/ -a -ldflags '-s -w -linkmode external -extldflags "-static"' ./cmd/renterd
           cp README.md LICENSE bin/
           zip -qj $ZIP_OUTPUT bin/*
-      - name: Get Release Asset
-        uses: actions/github-script@v7
-        id: get_release_asset
-        env:
-          ARCH: ${{ matrix.arch }}
-          NETWORK: ${{ matrix.network }}
-        with:
-          result-encoding: string
-          script: |
-            const arch = process.env.ARCH,
-              network = process.env.NETWORK;
-
-            switch (network) {
-            case 'mainnet':
-              return `renterd_linux_${arch}`;
-            default:
-              return `renterd_${network}_linux_${arch}`;
-            }
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.get_release_asset.outputs.result }}
-          path: release/
+          name: renterd_linux_${{ matrix.arch }}
+          path: release/*
   build-mac:
     runs-on: macos-latest
     strategy:
       matrix:
-        network: ["mainnet" , "zen"]
         arch: [ amd64, arm64 ]
     steps:
       - uses: actions/checkout@v4
@@ -169,15 +124,6 @@ jobs:
 
           # generate
           go generate ./...
-      - name: Set build tag environment variable
-        run: |
-          if [[ "${{ matrix.network }}" == "zen" ]]; then
-              echo "BUILD_TAGS=testnet netgo" >> $GITHUB_ENV
-              echo "ZIP_OUTPUT_SUFFIX=_zen" >> $GITHUB_ENV
-          else
-              echo "BUILD_TAGS=netgo" >> $GITHUB_ENV
-              echo "ZIP_OUTPUT_SUFFIX=" >> $GITHUB_ENV
-          fi
       - name: Build ${{ matrix.arch }}
         env:
           APPLE_CERT_ID: ${{ secrets.APPLE_CERT_ID }}
@@ -193,53 +139,25 @@ jobs:
         run: |
           mkdir -p release
           ZIP_OUTPUT=release/renterd${{ env.ZIP_OUTPUT_SUFFIX }}_${GOOS}_${GOARCH}.zip
-          go build -tags="$BUILD_TAGS" -trimpath -o bin/ -a -ldflags '-s -w' ./cmd/renterd
+          go build -trimpath -o bin/ -a -ldflags '-s -w' ./cmd/renterd
           cp README.md LICENSE bin/
           /usr/bin/codesign --deep -f -v --timestamp -o runtime,library -s $APPLE_CERT_ID bin/renterd
           ditto -ck bin $ZIP_OUTPUT
           xcrun notarytool submit -k ~/private_keys/AuthKey_$APPLE_API_KEY.p8 -d $APPLE_API_KEY -i $APPLE_API_ISSUER --wait --timeout 10m $ZIP_OUTPUT
-      - name: Get Release Asset
-        uses: actions/github-script@v7
-        id: get_release_asset
-        env:
-          ARCH: ${{ matrix.arch }}
-          NETWORK: ${{ matrix.network }}
-        with:
-          result-encoding: string
-          script: |
-            const arch = process.env.ARCH,
-              network = process.env.NETWORK;
-
-            switch (network) {
-            case 'mainnet':
-              return `renterd_darwin_${arch}`;
-            default:
-              return `renterd_${network}_darwin_${arch}`;
-            }
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.get_release_asset.outputs.result }}
-          path: release/
+          name: renterd_darwin_${{ matrix.arch }}
+          path: release/*
   build-windows:
     runs-on: windows-latest
     strategy:
       matrix:
-        network: ["mainnet" , "zen"]
         arch: [ amd64 ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
           go-version: 'stable'
-      - name: Set build tag environment variable
-        run: |
-          if ( "${{ matrix.network }}" -eq "zen" ) {
-            "BUILD_TAGS=testnet netgo" >> $env:GITHUB_ENV
-            "ZIP_OUTPUT_SUFFIX=_zen" >> $env:GITHUB_ENV
-          } else {
-            "BUILD_TAGS=netgo" >> $env:GITHUB_ENV
-            "ZIP_OUTPUT_SUFFIX=" >> $env:GITHUB_ENV
-          }
       - name: Setup
         shell: bash
         run: |
@@ -254,32 +172,14 @@ jobs:
         run: |
           mkdir -p release
           ZIP_OUTPUT=release/renterd${{ env.ZIP_OUTPUT_SUFFIX }}_${GOOS}_${GOARCH}.zip
-          go build -tags="$BUILD_TAGS" -trimpath -o bin/ -a -ldflags '-s -w -linkmode external -extldflags "-static"' ./cmd/renterd
+          go build -trimpath -o bin/ -a -ldflags '-s -w -linkmode external -extldflags "-static"' ./cmd/renterd
           azuresigntool sign -kvu "${{ secrets.AZURE_KEY_VAULT_URI }}" -kvi "${{ secrets.AZURE_CLIENT_ID }}" -kvt "${{ secrets.AZURE_TENANT_ID }}" -kvs "${{ secrets.AZURE_CLIENT_SECRET }}" -kvc ${{ secrets.AZURE_CERT_NAME }} -tr http://timestamp.digicert.com -v bin/renterd.exe
           cp README.md LICENSE bin/
           7z a $ZIP_OUTPUT bin/*
-      - name: Get Release Asset
-        uses: actions/github-script@v7
-        id: get_release_asset
-        env:
-          ARCH: ${{ matrix.arch }}
-          NETWORK: ${{ matrix.network }}
-        with:
-          result-encoding: string
-          script: |
-            const arch = process.env.ARCH,
-              network = process.env.NETWORK;
-
-            switch (network) {
-            case 'mainnet':
-              return `renterd_windows_${arch}`;
-            default:
-              return `renterd_${network}_windows_${arch}`;
-            }
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.get_release_asset.outputs.result }}
-          path: release/
+          name: renterd_windows_${{ matrix.arch }}
+          path: release/*
 
   combine-release-assets:
     runs-on: ubuntu-latest

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest , macos-latest, windows-latest ]
-        go-version: [ '1.21', '1.22' ]
+        go-version: [ '1.22', '1.23' ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -49,7 +49,7 @@ jobs:
           host port: 3800
           mysql version: '8'
           mysql root password: test
-      - name: Test
+      - name: Test Stores
         uses: n8maninger/action-golang-test@v1
         with:
           args: "-race;-short"
@@ -67,7 +67,7 @@ jobs:
         uses: n8maninger/action-golang-test@v1
         with:
           package: "./internal/test/e2e/..."
-          args: "-failfast;-race;-tags=testing;-timeout=30m"
+          args: "-failfast;-race;-tags=testing;-timeout=60m"
       - name: Test Integration - MySQL
         if: matrix.os == 'ubuntu-latest'
         uses: n8maninger/action-golang-test@v1
@@ -77,6 +77,6 @@ jobs:
           RENTERD_DB_PASSWORD: test
         with:
           package: "./internal/test/e2e/..."
-          args: "-failfast;-race;-tags=testing;-timeout=30m"
+          args: "-failfast;-race;-tags=testing;-timeout=60m"
       - name: Build
         run: go build -o bin/ ./cmd/renterd

.github/workflows/ui.yml

@@ -15,4 +15,4 @@ jobs:
         with:
           moduleName: 'renterd'
           goVersion: '1.21'
-          token: ${{ secrets.GITHUB_TOKEN }} 
+          token: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -41,6 +41,7 @@ overview of all settings configurable through the CLI.
 | `Directory`                          | Directory for storing node state                     | `.`                               | `--dir`                          | -                                              | `directory`                        |
 | `Seed`                               | Seed for the node                                    | -                                 | -                                | `RENTERD_SEED`                                 | `seed`                              |
 | `AutoOpenWebUI`                      | Automatically open the web UI on startup             | `true`                            | `--openui`                       | -                                              | `autoOpenWebUI`                    |
+| `Network`                            | Network to run on (mainnet/zen/anagami)  | `mainnet`                          | `--network`                       | `RENTERD_NETWORK`                             | `network`                    |
 | `ShutdownTimeout`                    | Timeout for node shutdown                            | `5m`                              | `--node.shutdownTimeout`         | -                                              | `shutdownTimeout`                  |
 | `Log.Level`                          | Global logger level (debug\|info\|warn\|error). Defaults to 'info' | `info`                            | `--log.level`               | `RENTERD_LOG_LEVEL`                          | `log.level`                         |
 | `Log.File.Enabled`                   | Enables logging to disk. Defaults to 'true'          | `true`                            | `--log.file.enabled`              | `RENTERD_LOG_FILE_ENABLED`                   | `log.file.enabled`                  |
@@ -408,14 +409,14 @@ ghcr.io/siafoundation/renterd.
 version: "3.9"
 services:
   renterd:
-    image: ghcr.io/siafoundation/renterd:master-zen
+    image: ghcr.io/siafoundation/renterd:master
     environment:
       - RENTERD_SEED=put your seed here
       - RENTERD_API_PASSWORD=test
     ports:
-      - 9880:9880
-      - 9881:9881
-      - 7070:7070
+      - 9980:9980
+      - 9981:9981
+      - 8080:8080
     volumes:
       - ./data:/data
     restart: unless-stopped
@@ -427,23 +428,16 @@ services:
 From within the root of the repo run the following command to build an image of
 `renterd` tagged `renterd`.
 
-#### Mainnet
-
 ```sh
 docker build -t renterd:master -f ./docker/Dockerfile .
 ```
 
-#### Testnet
-
-```sh
-docker build --build-arg BUILD_TAGS='netgo testnet' -t renterd:master-zen -f ./docker/Dockerfile .
-```
-
 ### Run Container
 
 Run `renterd` in the background as a container named `renterd` that exposes its
 API to the host system and the gateway to the world.
 
+
 #### Mainnet
 
 ```bash
@@ -452,10 +446,16 @@ docker run -d --name renterd -e RENTERD_API_PASSWORD="<PASSWORD>" -e RENTERD_SEE
 
 #### Testnet
 
+To run `renterd` on testnet use the `RENTERD_NETWORK` environment variable.
+
 ```bash
-docker run -d --name renterd-testnet -e RENTERD_API_PASSWORD="<PASSWORD>" -e RENTERD_SEED="<SEED>" -p 127.0.0.1:9880:9880/tcp -p :9881:9881/tcp ghcr.io/siafoundation/renterd:master-zen
+docker run -d --name renterd -e RENTERD_API_PASSWORD="<PASSWORD>" -e RENTERD_NETWORK="<network>" -e RENTERD_SEED="<SEED>" -p 127.0.0.1:9980:9980/tcp -p :9981:9981/tcp ghcr.io/siafoundation/renterd:master
 ```
 
+Currently available values for `<network>` are:
+- `zen`
+- `anagami`
+
 ## Architecture
 
 `renterd` distinguishes itself from `siad` through a unique architecture
@@ -606,10 +606,10 @@ updated using the settings API:
 {
 	"hostBlockHeightLeeway": 6,                                   // 6 blocks
 	"maxContractPrice": "15000000000000000000000000",             // 15 SC per contract
-	"maxDownloadPrice": "3000000000000000000000000000",           // 3000 SC per 1 TiB
+	"maxDownloadPrice": "3000000000000000000000000000",           // 3000 SC per 1 TB
 	"maxRPCPrice": "1000000000000000000000",                      // 1mS per RPC
-	"maxStoragePrice": "631593542824",                            // 3000 SC per TiB per month
-	"maxUploadPrice": "3000000000000000000000000000",             // 3000 SC per 1 TiB
+	"maxStoragePrice": "631593542824",                            // 3000 SC per TB per month
+	"maxUploadPrice": "3000000000000000000000000000",             // 3000 SC per 1 TB
 	"migrationSurchargeMultiplier": 10,                           // overpay up to 10x for sectors migrations on critical slabs
 	"minAccountExpiry": 86400000000000,                           // 1 day
 	"minMaxEphemeralAccountBalance": "1000000000000000000000000", // 1 SC

alerts/alerts_test.go

@@ -47,7 +47,7 @@ var _ webhooks.WebhookStore = (*testWebhookStore)(nil)
 
 func TestWebhooks(t *testing.T) {
 	store := &testWebhookStore{}
-	mgr, err := webhooks.NewManager(zap.NewNop().Sugar(), store)
+	mgr, err := webhooks.NewManager(store, zap.NewNop())
 	if err != nil {
 		t.Fatal(err)
 	}

api/autopilot.go

@@ -3,9 +3,10 @@ package api
 import (
 	"errors"
 	"fmt"
+	"sort"
 
 	"go.sia.tech/core/types"
-	"go.sia.tech/siad/build"
+	"go.sia.tech/renterd/internal/utils"
 )
 
 const (
@@ -131,8 +132,19 @@ type (
 func (c AutopilotConfig) Validate() error {
 	if c.Hosts.MaxDowntimeHours > 99*365*24 {
 		return ErrMaxDowntimeHoursTooHigh
-	} else if c.Hosts.MinProtocolVersion != "" && !build.IsVersion(c.Hosts.MinProtocolVersion) {
+	} else if c.Hosts.MinProtocolVersion != "" && !utils.IsVersion(c.Hosts.MinProtocolVersion) {
 		return fmt.Errorf("invalid min protocol version '%s'", c.Hosts.MinProtocolVersion)
 	}
 	return nil
 }
+
+func (c ContractsConfig) SortContractsForMaintenance(contracts []Contract) {
+	sort.SliceStable(contracts, func(i, j int) bool {
+		iInSet := contracts[i].InSet(c.Set)
+		jInSet := contracts[j].InSet(c.Set)
+		if iInSet != jInSet {
+			return iInSet
+		}
+		return contracts[i].FileSize() > contracts[j].FileSize()
+	})
+}