Merge pull request #195 from SiaFoundation/nate/auto-announce

Automatically Announce
SiaFoundation · Nov 1, 2023 · 6f338f1 · 6f338f1
2 parents eeb000d + 0e9ad40
commit 6f338f1
Show file tree

Hide file tree

Showing 27 changed files with 542 additions and 71 deletions.
diff --git a/host/alerts/alerts.go → alerts/alerts.go b/host/alerts/alerts.go → alerts/alerts.go
diff --git a/api/api.go b/api/api.go
@@ -8,8 +8,8 @@ import (
 	"go.sia.tech/core/consensus"
 	rhp3 "go.sia.tech/core/rhp/v3"
 	"go.sia.tech/core/types"
+	"go.sia.tech/hostd/alerts"
 	"go.sia.tech/hostd/host/accounts"
-	"go.sia.tech/hostd/host/alerts"
 	"go.sia.tech/hostd/host/contracts"
 	"go.sia.tech/hostd/host/metrics"
 	"go.sia.tech/hostd/host/settings"
@@ -39,6 +39,7 @@ type (
 
 		UpdateSettings(s settings.Settings) error
 		Settings() settings.Settings
+		LastAnnouncement() (settings.Announcement, error)
 
 		UpdateDDNS(force bool) error
 	}

diff --git a/api/endpoints.go b/api/endpoints.go
@@ -38,11 +38,18 @@ func (a *api) checkServerError(c jape.Context, context string, err error) bool {
 }
 
 func (a *api) handleGETHostState(c jape.Context) {
+	announcement, err := a.settings.LastAnnouncement()
+	if err != nil {
+		c.Error(err, http.StatusInternalServerError)
+		return
+	}
+
 	c.Encode(HostState{
-		Name:          a.name,
-		PublicKey:     a.hostKey,
-		WalletAddress: a.wallet.Address(),
-		StartTime:     startTime,
+		Name:             a.name,
+		PublicKey:        a.hostKey,
+		WalletAddress:    a.wallet.Address(),
+		StartTime:        startTime,
+		LastAnnouncement: announcement,
 		BuildState: BuildState{
 			Network:   build.NetworkName(),
 			Version:   build.Version(),

diff --git a/api/types.go b/api/types.go
@@ -9,6 +9,7 @@ import (
 
 	"go.sia.tech/core/types"
 	"go.sia.tech/hostd/host/contracts"
+	"go.sia.tech/hostd/host/settings"
 	"go.sia.tech/hostd/host/storage"
 )
 
@@ -50,10 +51,11 @@ type (
 
 	// HostState is the response body for the [GET] /state/host endpoint.
 	HostState struct {
-		Name          string          `json:"name,omitempty"`
-		PublicKey     types.PublicKey `json:"publicKey"`
-		WalletAddress types.Address   `json:"walletAddress"`
-		StartTime     time.Time       `json:"startTime"`
+		Name             string                `json:"name,omitempty"`
+		PublicKey        types.PublicKey       `json:"publicKey"`
+		LastAnnouncement settings.Announcement `json:"lastAnnouncement"`
+		WalletAddress    types.Address         `json:"walletAddress"`
+		StartTime        time.Time             `json:"startTime"`
 		BuildState
 	}
 

diff --git a/cmd/hostd/metrics.go b/cmd/hostd/metrics.go
diff --git a/cmd/hostd/node.go b/cmd/hostd/node.go
@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"go.sia.tech/core/types"
+	"go.sia.tech/hostd/alerts"
 	"go.sia.tech/hostd/host/accounts"
-	"go.sia.tech/hostd/host/alerts"
 	"go.sia.tech/hostd/host/contracts"
 	"go.sia.tech/hostd/host/metrics"
 	"go.sia.tech/hostd/host/registry"
@@ -162,13 +162,14 @@ func newNode(walletKey types.PrivateKey, logger *zap.Logger) (*node, types.Priva
 	discoveredAddr := net.JoinHostPort(g.Address().Host(), rhp2Port)
 	logger.Debug("discovered address", zap.String("addr", discoveredAddr))
 
-	sr, err := settings.NewConfigManager(cfg.Directory, hostKey, discoveredAddr, db, cm, tp, w, logger.Named("settings"))
+	am := alerts.NewManager()
+	sr, err := settings.NewConfigManager(cfg.Directory, hostKey, discoveredAddr, db, cm, tp, w, am, logger.Named("settings"))
 	if err != nil {
 		return nil, types.PrivateKey{}, fmt.Errorf("failed to create settings manager: %w", err)
 	}
 
 	accountManager := accounts.NewManager(db, sr)
-	am := alerts.NewManager()
+
 	sm, err := storage.NewVolumeManager(db, am, cm, logger.Named("volumes"), sr.Settings().SectorCacheSize)
 	if err != nil {
 		return nil, types.PrivateKey{}, fmt.Errorf("failed to create storage manager: %w", err)

diff --git a/cmd/logparse/main.go b/cmd/logparse/main.go
@@ -0,0 +1,36 @@
+package main
+
+import (
+	"encoding/json"
+	"os"
+	"strconv"
+)
+
+func main() {
+	f, err := os.Open("/Users/n8maninger/Downloads/hostd.log")
+	if err != nil {
+		panic(err)
+	}
+	defer f.Close()
+
+	dec := json.NewDecoder(f)
+
+	enc := json.NewEncoder(os.Stdout)
+	enc.SetIndent("", "  ")
+
+	for {
+		var v map[string]any
+		if err := dec.Decode(&v); err != nil {
+			break
+		}
+
+		ts, _ := v["ts"].(string)
+		f, err := strconv.ParseFloat(ts, 64)
+		if err != nil {
+			continue
+		} else if f < 1693360589.0406103 {
+			continue
+		}
+		enc.Encode(v)
+	}
+}
diff --git a/host/accounts/accounts_test.go b/host/accounts/accounts_test.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"go.sia.tech/core/types"
+	"go.sia.tech/hostd/alerts"
 	"go.sia.tech/hostd/host/accounts"
-	"go.sia.tech/hostd/host/alerts"
 	"go.sia.tech/hostd/host/contracts"
 	"go.sia.tech/hostd/host/settings"
 	"go.sia.tech/hostd/host/storage"

diff --git a/host/accounts/budget_test.go b/host/accounts/budget_test.go
@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"go.sia.tech/core/types"
+	"go.sia.tech/hostd/alerts"
 	"go.sia.tech/hostd/host/accounts"
-	"go.sia.tech/hostd/host/alerts"
 	"go.sia.tech/hostd/host/contracts"
 	"go.sia.tech/hostd/host/storage"
 	"go.sia.tech/hostd/internal/chain"

diff --git a/host/contracts/actions.go b/host/contracts/actions.go
@@ -7,7 +7,7 @@ import (
 
 	rhp2 "go.sia.tech/core/rhp/v2"
 	"go.sia.tech/core/types"
-	"go.sia.tech/hostd/host/alerts"
+	"go.sia.tech/hostd/alerts"
 	"go.uber.org/zap"
 	"lukechampine.com/frand"
 )

diff --git a/host/contracts/contracts_test.go b/host/contracts/contracts_test.go
@@ -8,7 +8,7 @@ import (
 
 	rhp2 "go.sia.tech/core/rhp/v2"
 	"go.sia.tech/core/types"
-	"go.sia.tech/hostd/host/alerts"
+	"go.sia.tech/hostd/alerts"
 	"go.sia.tech/hostd/host/contracts"
 	"go.sia.tech/hostd/host/storage"
 	"go.sia.tech/hostd/internal/test"

diff --git a/host/contracts/integrity.go b/host/contracts/integrity.go
@@ -10,7 +10,7 @@ import (
 
 	rhp2 "go.sia.tech/core/rhp/v2"
 	"go.sia.tech/core/types"
-	"go.sia.tech/hostd/host/alerts"
+	"go.sia.tech/hostd/alerts"
 	"go.uber.org/zap"
 	"lukechampine.com/frand"
 )

diff --git a/host/contracts/integrity_test.go b/host/contracts/integrity_test.go
@@ -12,7 +12,7 @@ import (
 
 	rhp2 "go.sia.tech/core/rhp/v2"
 	"go.sia.tech/core/types"
-	"go.sia.tech/hostd/host/alerts"
+	"go.sia.tech/hostd/alerts"
 	"go.sia.tech/hostd/host/contracts"
 	"go.sia.tech/hostd/host/storage"
 	"go.sia.tech/hostd/internal/test"

diff --git a/host/contracts/manager.go b/host/contracts/manager.go
@@ -15,7 +15,7 @@ import (
 	"go.sia.tech/core/consensus"
 	rhp2 "go.sia.tech/core/rhp/v2"
 	"go.sia.tech/core/types"
-	"go.sia.tech/hostd/host/alerts"
+	"go.sia.tech/hostd/alerts"
 	"go.sia.tech/hostd/internal/chain"
 	"go.sia.tech/hostd/internal/threadgroup"
 	"go.sia.tech/siad/modules"

diff --git a/host/contracts/manager_test.go b/host/contracts/manager_test.go
@@ -11,7 +11,7 @@ import (
 
 	rhp2 "go.sia.tech/core/rhp/v2"
 	"go.sia.tech/core/types"
-	"go.sia.tech/hostd/host/alerts"
+	"go.sia.tech/hostd/alerts"
 	"go.sia.tech/hostd/host/contracts"
 	"go.sia.tech/hostd/host/storage"
 	"go.sia.tech/hostd/internal/test"