all: support rhp4

SiaFoundation · Nov 1, 2024 · 1058cfa · 1058cfa
1 parent 8319b75
commit 1058cfa
Show file tree

Hide file tree

Showing 54 changed files with 1,381 additions and 1,169 deletions.
diff --git a/api/api.go b/api/api.go
@@ -20,7 +20,6 @@ import (
 	"go.sia.tech/hostd/host/settings"
 	"go.sia.tech/hostd/host/settings/pin"
 	"go.sia.tech/hostd/host/storage"
-	"go.sia.tech/hostd/rhp"
 	"go.sia.tech/hostd/webhooks"
 	"go.sia.tech/jape"
 	"go.uber.org/zap"
@@ -86,7 +85,7 @@ type (
 		SetReadOnly(id int64, readOnly bool) error
 		RemoveSector(root types.Hash256) error
 		ResizeCache(size uint32)
-		Read(types.Hash256) (*[rhp2.SectorSize]byte, error)
+		ReadSector(types.Hash256) (*[rhp2.SectorSize]byte, error)
 
 		// SectorReferences returns the references to a sector
 		SectorReferences(root types.Hash256) (storage.SectorReference, error)
@@ -152,14 +151,6 @@ type (
 		BroadcastToWebhook(id int64, event, scope string, data interface{}) error
 	}
 
-	// A RHPSessionReporter reports on RHP session lifecycle events
-	RHPSessionReporter interface {
-		Subscribe(rhp.SessionSubscriber)
-		Unsubscribe(rhp.SessionSubscriber)
-
-		Active() []rhp.Session
-	}
-
 	// An api provides an HTTP API for the host
 	api struct {
 		hostKey types.PublicKey
@@ -168,7 +159,6 @@ type (
 		log      *zap.Logger
 		alerts   Alerts
 		webhooks Webhooks
-		sessions RHPSessionReporter
 
 		sqlite3Store SQLite3Store
 
@@ -201,22 +191,12 @@ func (a *api) requiresExplorer(h jape.Handler) jape.Handler {
 	}
 }
 
-// NewServer initializes the API
-// syncer
-// chain
-// accounts
-// contracts
-// volumes
-// wallet
-// metrics
-// settings
-// index
+// NewServer initializes the API server with the given options
 func NewServer(name string, hostKey types.PublicKey, cm ChainManager, s Syncer, am AccountManager, c ContractManager, vm VolumeManager, wm Wallet, mm MetricManager, sm Settings, im Index, opts ...ServerOption) http.Handler {
 	a := &api{
 		hostKey: hostKey,
 		name:    name,
 
-		sessions: noopSessionReporter{},
 		alerts:   noopAlerts{},
 		webhooks: noopWebhooks{},
 		log:      zap.NewNop(),
@@ -291,9 +271,6 @@ func NewServer(name string, hostKey types.PublicKey, cm ChainManager, s Syncer,
 		"DELETE /volumes/:id":        a.handleDeleteVolume,
 		"DELETE /volumes/:id/cancel": a.handleDELETEVolumeCancelOp,
 		"PUT /volumes/:id/resize":    a.handlePUTVolumeResize,
-		// session endpoints
-		"GET /sessions":           a.handleGETSessions,
-		"GET /sessions/subscribe": a.handleGETSessionsSubscribe,
 		// tpool endpoints
 		"GET /tpool/fee": a.handleGETTPoolFee,
 		// wallet endpoints

diff --git a/api/options.go b/api/options.go
@@ -4,7 +4,6 @@ import (
 	"go.sia.tech/core/types"
 	"go.sia.tech/hostd/alerts"
 	"go.sia.tech/hostd/explorer"
-	"go.sia.tech/hostd/rhp"
 	"go.sia.tech/hostd/webhooks"
 	"go.uber.org/zap"
 )
@@ -51,13 +50,6 @@ func WithExplorer(explorer *explorer.Explorer) ServerOption {
 	}
 }
 
-// WithRHPSessionReporter sets the RHP session reporter for the API server.
-func WithRHPSessionReporter(rsr RHPSessionReporter) ServerOption {
-	return func(a *api) {
-		a.sessions = rsr
-	}
-}
-
 // WithLogger sets the logger for the API server.
 func WithLogger(log *zap.Logger) ServerOption {
 	return func(a *api) {
@@ -81,9 +73,3 @@ type noopAlerts struct{}
 
 func (noopAlerts) Active() []alerts.Alert   { return nil }
 func (noopAlerts) Dismiss(...types.Hash256) {}
-
-type noopSessionReporter struct{}
-
-func (noopSessionReporter) Subscribe(rhp.SessionSubscriber)   {}
-func (noopSessionReporter) Unsubscribe(rhp.SessionSubscriber) {}
-func (noopSessionReporter) Active() []rhp.Session             { return nil }
diff --git a/api/prometheus.go b/api/prometheus.go
@@ -462,24 +462,3 @@ func (w WalletPendingResp) PrometheusMetric() (metrics []prometheus.Metric) {
 	}
 	return
 }
-
-// PrometheusMetric returns Prometheus samples for the hosts sessions
-func (s SessionResp) PrometheusMetric() (metrics []prometheus.Metric) {
-	for _, session := range s {
-		metrics = append(metrics, prometheus.Metric{
-			Name: "hostd_session_ingress",
-			Labels: map[string]any{
-				"peer": session.PeerAddress,
-			},
-			Value: float64(session.Ingress),
-		})
-		metrics = append(metrics, prometheus.Metric{
-			Name: "hostd_session_egress",
-			Labels: map[string]any{
-				"peer": session.PeerAddress,
-			},
-			Value: float64(session.Egress),
-		})
-	}
-	return
-}
diff --git a/api/rhpsessions.go b/api/rhpsessions.go
diff --git a/api/types.go b/api/types.go
@@ -14,7 +14,6 @@ import (
 	"go.sia.tech/hostd/host/metrics"
 	"go.sia.tech/hostd/host/settings"
 	"go.sia.tech/hostd/host/storage"
-	"go.sia.tech/hostd/rhp"
 )
 
 // JSON keys for host setting fields
@@ -193,9 +192,6 @@ type (
 
 	// WalletPendingResp is the response body for the [GET] /wallet/pending endpoint
 	WalletPendingResp []wallet.Event
-
-	// SessionResp is the response body for the [GET] /sessions endpoint
-	SessionResp []rhp.Session
 )
 
 // MarshalJSON implements json.Marshaler

diff --git a/api/volumes.go b/api/volumes.go
@@ -224,10 +224,10 @@ func (a *api) handleGETVerifySector(jc jape.Context) {
 	}
 
 	// try to read the sector data and verify the root
-	data, err := a.volumes.Read(root)
+	sector, err := a.volumes.ReadSector(root)
 	if err != nil {
 		resp.Error = err.Error()
-	} else if calc := rhp2.SectorRoot(data); calc != root {
+	} else if calc := rhp2.SectorRoot(sector); calc != root {
 		resp.Error = fmt.Sprintf("sector is corrupt: expected root %q, got %q", root, calc)
 	}
 	jc.Encode(resp)

diff --git a/cmd/hostd/main.go b/cmd/hostd/main.go
@@ -57,6 +57,11 @@ var (
 		RHP3: config.RHP3{
 			TCPAddress: ":9983",
 		},
+		RHP4: config.RHP4{
+			ListenAddresses: []config.RHP4ListenAddress{
+				{Protocol: "tcp", Address: ":9984"},
+			},
+		},
 		Log: config.Log{
 			Path:  os.Getenv(logFileEnvVar), // deprecated. included for compatibility.
 			Level: "info",