Collection of PRs that require UI update

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -66,10 +66,10 @@ body:
       description: |
         The configuration of your bus
         ```bash
-        curl -u ":[YOUR_PASSWORD]" http://localhost:9980/api/bus/setting/contractset
-        curl -u ":[YOUR_PASSWORD]" http://localhost:9980/api/bus/setting/gouging
-        curl -u ":[YOUR_PASSWORD]" http://localhost:9980/api/bus/setting/redundancy
-        curl -u ":[YOUR_PASSWORD]" http://localhost:9980/api/bus/setting/uploadpacking
+        curl -u ":[YOUR_PASSWORD]" http://localhost:9980/api/bus/settings/gouging
+        curl -u ":[YOUR_PASSWORD]" http://localhost:9980/api/bus/settings/pinned
+        curl -u ":[YOUR_PASSWORD]" http://localhost:9980/api/bus/settings/s3
+        curl -u ":[YOUR_PASSWORD]" http://localhost:9980/api/bus/settings/uploads
         ```
       placeholder: Paste the output of the above commands here
     validations:

.github/workflows/test.yml

@@ -25,13 +25,15 @@ jobs:
             autopilot
             bus bus/client
             worker worker/client
+          flags: |
+            -japecheck.types=false
   test:
     needs: analyze
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest , macos-latest, windows-latest ]
-        go-version: [ '1.22', '1.23' ]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        go-version: ["1.22", "1.23"]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -47,7 +49,7 @@ jobs:
         uses: mirromutth/[email protected]
         with:
           host port: 3800
-          mysql version: '8'
+          mysql version: "8"
           mysql root password: test
       - name: Test Stores
         uses: n8maninger/action-golang-test@v1

README.md

@@ -54,10 +54,6 @@ overview of all settings configurable through the CLI.
 | `Log.Database.Level`                 | Logger level for database queries (info\|warn\|error). Defaults to 'warn' | `warn`                            | `--log.database.level`          | `RENTERD_LOG_DATABASE_LEVEL`, `RENTERD_LOG_LEVEL` | `log.database.level`           |
 | `Log.Database.IgnoreRecordNotFoundError` | Enable ignoring 'not found' errors resulting from database queries. Defaults to 'true' | `true`                            | `--log.database.ignoreRecordNotFoundError` | `RENTERD_LOG_DATABASE_IGNORE_RECORD_NOT_FOUND_ERROR` | `log.database.ignoreRecordNotFoundError` |
 | `Log.Database.SlowThreshold`         | Threshold for slow queries in logger. Defaults to 100ms | `100ms`                          | `--log.database.slowThreshold`  | `RENTERD_LOG_DATABASE_SLOW_THRESHOLD`         | `log.database.slowThreshold`        |
-| `Log.Database.Level (DEPRECATED)`    | Logger level                                        | `warn`                            | `--db.logger.logLevel`           | `RENTERD_DB_LOGGER_LOG_LEVEL`                  | `log.database.level`               |
-| `Log.Database.IgnoreRecordNotFoundError (DEPRECATED)` | Ignores 'not found' errors in logger    | `true`                            | `--db.logger.ignoreNotFoundError`| `RENTERD_DB_LOGGER_IGNORE_NOT_FOUND_ERROR`     | `log.ignoreRecordNotFoundError` |
-| `Log.Database.SlowThreshold (DEPRECATED)`    | Threshold for slow queries in logger    | `100ms`                          | `--db.logger.slowThreshold`      | `RENTERD_DB_LOGGER_SLOW_THRESHOLD`             | `log.slowThreshold`       |
-| `Log.Path (DEPRECATED)`              | Path to directory for logs                          | -                                 | `--log-path`                     | `RENTERD_LOG_PATH`                             | `log.path`                         |
 | `Database.MySQL.URI`                 | Database URI for the bus                             | -                                 | `--db.uri`                      | `RENTERD_DB_URI`                              | `database.mysql.uri`                |
 | `Database.MySQL.User`                | Database username for the bus                        | `renterd`                         | `--db.user`                     | `RENTERD_DB_USER`                             | `database.mysql.user`               |
 | `Database.MySQL.Password`            | Database password for the bus                        | -                                 | -                               | `RENTERD_DB_PASSWORD`                         | `database.mysql.password`           |
@@ -70,7 +66,6 @@ overview of all settings configurable through the CLI.
 | `Bus.GatewayAddr`                    | Address for Sia peer connections                     | `:9981`                          | `--bus.gatewayAddr`             | `RENTERD_BUS_GATEWAY_ADDR`                     | `bus.gatewayAddr`                   |
 | `Bus.RemoteAddr`                     | Remote address for the bus                           | -                                 | -                               | `RENTERD_BUS_REMOTE_ADDR`                      | `bus.remoteAddr`                    |
 | `Bus.RemotePassword`                 | Remote password for the bus                          | -                                 | -                               | `RENTERD_BUS_API_PASSWORD`                     | `bus.remotePassword`                |
-| `Bus.PersistInterval`                | Interval for persisting consensus updates            | `1m`                              | `--bus.persistInterval`         | -                                              | `bus.persistInterval`               |
 | `Bus.UsedUTXOExpiry`                 | Expiry for used UTXOs in transactions                | `24h`                             | `--bus.usedUTXOExpiry`          | -                                              | `bus.usedUtxoExpiry`                |
 | `Bus.SlabBufferCompletionThreshold`  | Threshold for slab buffer upload                     | `4096`                            | `--bus.slabBufferCompletionThreshold` | `RENTERD_BUS_SLAB_BUFFER_COMPLETION_THRESHOLD` | `bus.slabBufferCompletionThreshold` |
 | `Worker.AllowPrivateIPs`             | Allows hosts with private IPs                        | -                                 | `--worker.allowPrivateIPs`       | -                                              | `worker.allowPrivateIPs`            |
@@ -102,7 +97,8 @@ overview of all settings configurable through the CLI.
 | `S3.Enabled`                         | Enables/disables S3 API                              | `true`                            | `--s3.enabled`                     | `RENTERD_S3_ENABLED`                           | `s3.enabled`                        |
 | `S3.HostBucketBases`       | Enables bucket rewriting in the router for the provided bases  | -                                 | `--s3.hostBucketBases`           | `RENTERD_S3_HOST_BUCKET_BASES`               | `s3.hostBucketBases`              |
 | `S3.HostBucketEnabled`               | Enables bucket rewriting in the router               | -                                 | `--s3.hostBucketEnabled`           | `RENTERD_S3_HOST_BUCKET_ENABLED`               | `s3.hostBucketEnabled`              |
-| `S3.KeypairsV4 (DEPRECATED)`                      | V4 keypairs for S3                                   | -                                 | -                                  | -            | `s3.keypairsV4`                     |
+| `Explorer.Disable`                    | Disables explorer service                            | `false`                           | `--explorer.disable`               | `RENTERD_EXPLORER_DISABLE`                      | `explorer.disable`                  |
+| `Explorer.URL`                        | URL of service to retrieve data about the Sia network | `https://api.siascan.com`         | `--explorer.url`                   | `RENTERD_EXPLORER_URL`                          | `explorer.url`                      |
 
 ### Single-Node Setup
 
@@ -558,65 +554,6 @@ formed.
 }
 ```
 
-### Contract Set
-
-The contract set settings on the bus allow specifying a default contract set.
-This contract set will be returned by the `bus` through the upload parameters,
-and decides what contracts data is upload or migrated to by default. This
-setting does not have a default value, it can be updated using the settings API:
-
-- `GET /api/bus/setting/contractset`
-- `PUT /api/bus/setting/contractset`
-
-```json
-{
-        "default": "autopilot"
-}
-```
-
-In most cases the default set should match the set from your autopilot
-configuration in order for migrations to work properly. The contract set can be
-overridden by passing it as a query string parameter to the worker's upload and
-migrate endpoints.
-
-- `PUT /api/worker/objects/foo?contractset=foo`
-
-### Redundancy
-
-The default redundancy on mainnet is 30-10, on testnet it is 6-2. The redundancy
-can be updated using the settings API:
-
-- `GET /api/bus/setting/redundancy`
-- `PUT /api/bus/setting/redundancy`
-
-The redundancy can also be passed through query string parameters on the upload
-endpoint in the worker API:
-
-- `PUT /api/worker/objects/foo?minshards=2&totalshards=5`
-
-### Gouging
-
-The default gouging settings are listed below. The gouging settings can be
-updated using the settings API:
-
-- `GET /api/bus/setting/gouging`
-- `PUT /api/bus/setting/gouging`
-
-```json
-{
-	"hostBlockHeightLeeway": 6,                                   // 6 blocks
-	"maxContractPrice": "15000000000000000000000000",             // 15 SC per contract
-	"maxDownloadPrice": "3000000000000000000000000000",           // 3000 SC per 1 TB
-	"maxRPCPrice": "1000000000000000000000",                      // 1mS per RPC
-	"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
-	"minPriceTableValidity": 300000000000                         // 5 minutes
-}
-```
-
 ### Blocklist
 
 Unfortunately the Sia blockchain is subject to hosts that announced themselves

alerts/prometheus.go

@@ -0,0 +1,24 @@
+package alerts
+
+import "go.sia.tech/renterd/internal/prometheus"
+
+// PrometheusMetric implements prometheus.Marshaller.
+func (a Alert) PrometheusMetric() (metrics []prometheus.Metric) {
+	metrics = append(metrics, prometheus.Metric{
+		Name: "renterd_alert",
+		Labels: map[string]any{
+			"id":        a.ID,
+			"severity":  a.Severity.String(),
+			"message":   a.Message,
+			"timestamp": a.Timestamp,
+		},
+		Value: 1,
+	})
+	return
+}
+
+// PrometheusMetric implements prometheus.Marshaller.
+func (a AlertsResponse) PrometheusMetric() (metrics []prometheus.Metric) {
+	metrics = prometheus.Slice(a.Alerts).PrometheusMetric()
+	return
+}

api/autopilot.go

@@ -86,6 +86,7 @@ type (
 	// AutopilotStateResponse is the response type for the /autopilot/state
 	// endpoint.
 	AutopilotStateResponse struct {
+		ID                 string      `json:"id"`
 		Configured         bool        `json:"configured"`
 		Migrating          bool        `json:"migrating"`
 		MigratingLastStart TimeRFC3339 `json:"migratingLastStart"`

api/bucket.go

@@ -4,10 +4,6 @@ import (
 	"errors"
 )
 
-const (
-	DefaultBucketName = "default"
-)
-
 var (
 	// ErrBucketExists is returned when trying to create a bucket that already
 	// exists.

api/bus.go

@@ -8,8 +8,12 @@ import (
 )
 
 var (
+	ErrInvalidOffset         = errors.New("offset must be non-negative")
+	ErrInvalidLength         = errors.New("length must be positive")
+	ErrInvalidLimit          = errors.New("limit must be -1 or bigger")
 	ErrMarkerNotFound        = errors.New("marker not found")
 	ErrMaxFundAmountExceeded = errors.New("renewal exceeds max fund amount")
+	ErrExplorerDisabled      = errors.New("explorer is disabled")
 )
 
 type (
@@ -64,6 +68,13 @@ type (
 		StartTime TimeRFC3339 `json:"startTime"`
 		Network   string      `json:"network"`
 		BuildState
+		Explorer ExplorerState `json:"explorer"`
+	}
+
+	// ExplorerState contains static information about explorer data sources.
+	ExplorerState struct {
+		Enabled bool   `json:"enabled"`
+		URL     string `json:"url,omitempty"`
 	}
 
 	ContractSetUpdateRequest struct {

api/contract.go

@@ -50,26 +50,32 @@ type (
 
 	// ContractMetadata contains all metadata for a contract.
 	ContractMetadata struct {
-		ID         types.FileContractID `json:"id"`
-		HostIP     string               `json:"hostIP"`
-		HostKey    types.PublicKey      `json:"hostKey"`
-		SiamuxAddr string               `json:"siamuxAddr"`
-
-		ProofHeight    uint64 `json:"proofHeight"`
-		RevisionHeight uint64 `json:"revisionHeight"`
-		RevisionNumber uint64 `json:"revisionNumber"`
-		Size           uint64 `json:"size"`
-		StartHeight    uint64 `json:"startHeight"`
-		State          string `json:"state"`
-		WindowStart    uint64 `json:"windowStart"`
-		WindowEnd      uint64 `json:"windowEnd"`
-
-		ContractPrice types.Currency       `json:"contractPrice"`
-		RenewedFrom   types.FileContractID `json:"renewedFrom"`
-		Spending      ContractSpending     `json:"spending"`
-		TotalCost     types.Currency       `json:"totalCost"`
-
-		ContractSets []string `json:"contractSets"`
+		ID      types.FileContractID `json:"id"`
+		HostKey types.PublicKey      `json:"hostKey"`
+
+		ProofHeight    uint64               `json:"proofHeight"`
+		RenewedFrom    types.FileContractID `json:"renewedFrom"`
+		RevisionHeight uint64               `json:"revisionHeight"`
+		RevisionNumber uint64               `json:"revisionNumber"`
+		Size           uint64               `json:"size"`
+		StartHeight    uint64               `json:"startHeight"`
+		State          string               `json:"state"`
+		WindowStart    uint64               `json:"windowStart"`
+		WindowEnd      uint64               `json:"windowEnd"`
+
+		// costs & spending
+		ContractPrice      types.Currency   `json:"contractPrice"`
+		InitialRenterFunds types.Currency   `json:"initialRenterFunds"`
+		Spending           ContractSpending `json:"spending"`
+
+		// following fields are decorated
+		HostIP       string   `json:"hostIP"`
+		ContractSets []string `json:"contractSets,omitempty"`
+		SiamuxAddr   string   `json:"siamuxAddr,omitempty"`
+
+		// following fields are only set on archived contracts
+		ArchivalReason string               `json:"archivalReason,omitempty"`
+		RenewedTo      types.FileContractID `json:"renewedTo,omitempty"`
 	}
 
 	// ContractPrunableData wraps a contract's size information with its id.
@@ -80,11 +86,10 @@ type (
 
 	// ContractSpending contains all spending details for a contract.
 	ContractSpending struct {
-		Uploads     types.Currency `json:"uploads"`
-		Downloads   types.Currency `json:"downloads"`
-		FundAccount types.Currency `json:"fundAccount"`
 		Deletions   types.Currency `json:"deletions"`
+		FundAccount types.Currency `json:"fundAccount"`
 		SectorRoots types.Currency `json:"sectorRoots"`
+		Uploads     types.Currency `json:"uploads"`
 	}
 
 	ContractSpendingRecord struct {
@@ -96,29 +101,6 @@ type (
 		MissedHostPayout  types.Currency `json:"missedHostPayout"`
 		ValidRenterPayout types.Currency `json:"validRenterPayout"`
 	}
-
-	// An ArchivedContract contains all information about a contract with a host
-	// that has been moved to the archive either due to expiring or being renewed.
-	ArchivedContract struct {
-		ID        types.FileContractID `json:"id"`
-		HostIP    string               `json:"hostIP"`
-		HostKey   types.PublicKey      `json:"hostKey"`
-		RenewedTo types.FileContractID `json:"renewedTo"`
-		Spending  ContractSpending     `json:"spending"`
-
-		ArchivalReason string               `json:"archivalReason"`
-		ContractPrice  types.Currency       `json:"contractPrice"`
-		ProofHeight    uint64               `json:"proofHeight"`
-		RenewedFrom    types.FileContractID `json:"renewedFrom"`
-		RevisionHeight uint64               `json:"revisionHeight"`
-		RevisionNumber uint64               `json:"revisionNumber"`
-		Size           uint64               `json:"size"`
-		StartHeight    uint64               `json:"startHeight"`
-		State          string               `json:"state"`
-		TotalCost      types.Currency       `json:"totalCost"`
-		WindowStart    uint64               `json:"windowStart"`
-		WindowEnd      uint64               `json:"windowEnd"`
-	}
 )
 
 type (
@@ -137,11 +119,11 @@ type (
 
 	// ContractAddRequest is the request type for the /contract/:id endpoint.
 	ContractAddRequest struct {
-		Contract      rhpv2.ContractRevision `json:"contract"`
-		ContractPrice types.Currency         `json:"contractPrice"`
-		StartHeight   uint64                 `json:"startHeight"`
-		State         string                 `json:"state,omitempty"`
-		TotalCost     types.Currency         `json:"totalCost"`
+		ContractPrice      types.Currency         `json:"contractPrice"`
+		InitialRenterFunds types.Currency         `json:"initialRenterFunds"`
+		Revision           rhpv2.ContractRevision `json:"revision"`
+		StartHeight        uint64                 `json:"startHeight"`
+		State              string                 `json:"state,omitempty"`
 	}
 
 	// ContractFormRequest is the request type for the POST /contracts endpoint.
@@ -192,17 +174,6 @@ type (
 		RenterFunds        types.Currency `json:"renterFunds"`
 	}
 
-	// ContractRenewedRequest is the request type for the /contract/:id/renewed
-	// endpoint.
-	ContractRenewedRequest struct {
-		Contract      rhpv2.ContractRevision `json:"contract"`
-		ContractPrice types.Currency         `json:"contractPrice"`
-		RenewedFrom   types.FileContractID   `json:"renewedFrom"`
-		StartHeight   uint64                 `json:"startHeight"`
-		State         string                 `json:"state,omitempty"`
-		TotalCost     types.Currency         `json:"totalCost"`
-	}
-
 	// ContractRootsResponse is the response type for the /contract/:id/roots
 	// endpoint.
 	ContractRootsResponse struct {
@@ -223,18 +194,18 @@ type (
 
 	ContractsOpts struct {
 		ContractSet string `json:"contractset"`
+		FilterMode  string `json:"filterMode"`
 	}
 )
 
 // Total returns the total cost of the contract spending.
 func (x ContractSpending) Total() types.Currency {
-	return x.Uploads.Add(x.Downloads).Add(x.FundAccount).Add(x.Deletions).Add(x.SectorRoots)
+	return x.Uploads.Add(x.FundAccount).Add(x.Deletions).Add(x.SectorRoots)
 }
 
 // Add returns the sum of the current and given contract spending.
 func (x ContractSpending) Add(y ContractSpending) (z ContractSpending) {
 	z.Uploads = x.Uploads.Add(y.Uploads)
-	z.Downloads = x.Downloads.Add(y.Downloads)
 	z.FundAccount = x.FundAccount.Add(y.FundAccount)
 	z.Deletions = x.Deletions.Add(y.Deletions)
 	z.SectorRoots = x.SectorRoots.Add(y.SectorRoots)