settings: don't log announcement warning when validate is disabled

api/api.go

@@ -132,8 +132,9 @@ type (
 
 		RecommendedFee() types.Currency
 		AddPoolTransactions(txns []types.Transaction) (known bool, err error)
-		AddV2PoolTransactions(basis types.ChainIndex, txns []types.V2Transaction) (known bool, err error)
 		UnconfirmedParents(txn types.Transaction) []types.Transaction
+		AddV2PoolTransactions(basis types.ChainIndex, txns []types.V2Transaction) (known bool, err error)
+		V2UnconfirmedParents(txn types.V2Transaction) []types.V2Transaction
 	}
 
 	// Webhooks manages webhooks

api/endpoints.go

@@ -474,7 +474,7 @@ func (a *api) handlePOSTWalletSend(jc jape.Context) {
 			return
 		}
 		a.wallet.SignV2Inputs(state, &txn, toSign)
-		txnset := []types.V2Transaction{txn}
+		txnset := append(a.chain.V2UnconfirmedParents(txn), txn)
 		// verify the transaction and add it to the transaction pool
 		if _, err := a.chain.AddV2PoolTransactions(state.Index, txnset); !a.checkServerError(jc, "failed to add v2 transaction set", err) {
 			a.wallet.ReleaseInputs(nil, []types.V2Transaction{txn})

host/settings/announce.go

@@ -24,11 +24,9 @@ func (m *ConfigManager) Announce() error {
 	// get the current settings
 	settings := m.Settings()
 
-	if err := validateNetAddress(settings.NetAddress); err != nil {
-		if m.validateNetAddress {
-			return fmt.Errorf("failed to validate net address: %w", err)
-		} else {
-			m.log.Warn("invalid net address", zap.Error(err))
+	if m.validateNetAddress {
+		if err := validateNetAddress(settings.NetAddress); err != nil {
+			return fmt.Errorf("failed to validate net address %q: %w", settings.NetAddress, err)
 		}
 	}
 
@@ -88,7 +86,7 @@ func (m *ConfigManager) Announce() error {
 func validateNetAddress(netaddress string) error {
 	host, port, err := net.SplitHostPort(netaddress)
 	if err != nil {
-		return fmt.Errorf("invalid net address %q: net addresses must contain a host and port: %w", netaddress, err)
+		return fmt.Errorf("net addresses must contain a host and port: %w", netaddress, err)
 	}
 
 	// Check that the host is not empty or localhost.
@@ -110,7 +108,7 @@ func validateNetAddress(netaddress string) error {
 	ip := net.ParseIP(host)
 	if ip != nil {
 		if ip.IsLoopback() || ip.IsPrivate() || !ip.IsGlobalUnicast() {
-			return fmt.Errorf("invalid net address %q: only public IP addresses allowed", host)
+			return fmt.Errorf("only public IP addresses allowed", host)
 		}
 		return nil
 	}