Merge branch 'dev' into chris/rename-scan-failures

alerts/alerts_test.go

@@ -57,7 +57,7 @@ func TestWebhooks(t *testing.T) {
 	mux := http.NewServeMux()
 	var events []webhooks.Event
 	var mu sync.Mutex
-	mux.HandleFunc("/events", func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc("/event", func(w http.ResponseWriter, r *http.Request) {
 		var event webhooks.Event
 		if err := json.NewDecoder(r.Body).Decode(&event); err != nil {
 			t.Fatal(err)
@@ -72,7 +72,7 @@ func TestWebhooks(t *testing.T) {
 	// register a hook
 	wh := webhooks.Webhook{
 		Module: webhookModule,
-		URL:    fmt.Sprintf("http://%v/events", srv.Listener.Addr().String()),
+		URL:    fmt.Sprintf("http://%v/event", srv.Listener.Addr().String()),
 	}
 	if hookID := wh.String(); hookID != fmt.Sprintf("%v.%v.%v", wh.URL, wh.Module, "") {
 		t.Fatalf("wrong result for wh.String(): %v != %v", wh.String(), hookID)

api/account.go

@@ -33,6 +33,10 @@ type (
 		// an account and the balance reported by a host.
 		Drift *big.Int `json:"drift"`
 
+		// Owner is the owner of the account which is responsible for funding
+		// it.
+		Owner string `json:"owner"`
+
 		// RequiresSync indicates whether an account needs to be synced with the
 		// host before it can be used again.
 		RequiresSync bool `json:"requiresSync"`

api/bus.go

@@ -45,6 +45,10 @@ type (
 )
 
 type (
+	AccountsSaveRequest struct {
+		Accounts []Account `json:"accounts"`
+	}
+
 	// BusStateResponse is the response type for the /bus/state endpoint.
 	BusStateResponse struct {
 		StartTime TimeRFC3339 `json:"startTime"`

api/contract.go

@@ -144,6 +144,16 @@ type (
 		TotalCost     types.Currency         `json:"totalCost"`
 	}
 
+	// ContractFormRequest is the request type for the POST /contracts endpoint.
+	ContractFormRequest struct {
+		EndHeight      uint64          `json:"endHeight"`
+		HostCollateral types.Currency  `json:"hostCollateral"`
+		HostKey        types.PublicKey `json:"hostKey"`
+		HostIP         string          `json:"hostIP"`
+		RenterFunds    types.Currency  `json:"renterFunds"`
+		RenterAddress  types.Address   `json:"renterAddress"`
+	}
+
 	// ContractKeepaliveRequest is the request type for the /contract/:id/keepalive
 	// endpoint.
 	ContractKeepaliveRequest struct {

api/wallet.go

@@ -5,7 +5,6 @@ import (
 	"net/url"
 	"time"
 
-	rhpv2 "go.sia.tech/core/rhp/v2"
 	rhpv3 "go.sia.tech/core/rhp/v3"
 	"go.sia.tech/core/types"
 )
@@ -45,18 +44,6 @@ type (
 		DependsOn   []types.Transaction `json:"dependsOn"`
 	}
 
-	// WalletPrepareFormRequest is the request type for the /wallet/prepare/form
-	// endpoint.
-	WalletPrepareFormRequest struct {
-		EndHeight      uint64             `json:"endHeight"`
-		HostCollateral types.Currency     `json:"hostCollateral"`
-		HostKey        types.PublicKey    `json:"hostKey"`
-		HostSettings   rhpv2.HostSettings `json:"hostSettings"`
-		RenterAddress  types.Address      `json:"renterAddress"`
-		RenterFunds    types.Currency     `json:"renterFunds"`
-		RenterKey      types.PublicKey    `json:"renterKey"`
-	}
-
 	// WalletPrepareRenewRequest is the request type for the /wallet/prepare/renew
 	// endpoint.
 	WalletPrepareRenewRequest struct {

api/worker.go

@@ -80,31 +80,13 @@ type (
 		Error             string `json:"error,omitempty"`
 	}
 
-	// RHPFormRequest is the request type for the /rhp/form endpoint.
-	RHPFormRequest struct {
-		EndHeight      uint64          `json:"endHeight"`
-		HostCollateral types.Currency  `json:"hostCollateral"`
-		HostKey        types.PublicKey `json:"hostKey"`
-		HostIP         string          `json:"hostIP"`
-		RenterFunds    types.Currency  `json:"renterFunds"`
-		RenterAddress  types.Address   `json:"renterAddress"`
-	}
-
 	// RHPFormResponse is the response type for the /rhp/form endpoint.
 	RHPFormResponse struct {
 		ContractID     types.FileContractID   `json:"contractID"`
 		Contract       rhpv2.ContractRevision `json:"contract"`
 		TransactionSet []types.Transaction    `json:"transactionSet"`
 	}
 
-	// RHPFundRequest is the request type for the /rhp/fund endpoint.
-	RHPFundRequest struct {
-		ContractID types.FileContractID `json:"contractID"`
-		HostKey    types.PublicKey      `json:"hostKey"`
-		SiamuxAddr string               `json:"siamuxAddr"`
-		Balance    types.Currency       `json:"balance"`
-	}
-
 	// RHPPruneContractRequest is the request type for the /rhp/contract/:id/prune
 	// endpoint.
 	RHPPruneContractRequest struct {