staticaddr: address review comments

Author: hieblmi

staticaddr/address/manager.go

@@ -246,17 +246,22 @@ func validateServerAddressParams(
 		return fmt.Errorf("missing server address parameters")
 	}
 
-	if len(params.GetServerKey()) == 0 {
+	serverKey := params.GetServerKey()
+	if len(serverKey) == 0 {
 		return fmt.Errorf("missing server public key")
 	}
+	if !btcec.IsCompressedPubKey(serverKey) {
+		return fmt.Errorf("server public key is not a compressed " +
+			"secp256k1 public key")
+	}
 
 	expiry := params.GetExpiry()
 	switch {
 	case expiry == 0:
 		return fmt.Errorf("static address CSV expiry must be non-zero")
 
 	case expiry&^wire.SequenceLockTimeMask != 0:
-		return fmt.Errorf("invalid static address CSV flags: %x",
+		return fmt.Errorf("static address expiry does not fit into CSV: %x",
 			expiry)
 
 	case expiry > maxStaticAddressCSVExpiry:

staticaddr/address/manager_test.go

@@ -156,6 +156,16 @@ func TestNewAddressValidatesServerResponse(t *testing.T) {
 			},
 			expected: "missing server public key",
 		},
+		{
+			name: "uncompressed server key",
+			resp: &swapserverrpc.ServerNewAddressResponse{
+				Params: &swapserverrpc.ServerAddressParameters{
+					ServerKey: []byte{0x04},
+					Expiry:    defaultExpiry,
+				},
+			},
+			expected: "server public key is not a compressed",
+		},
 		{
 			name:     "zero expiry",
 			resp:     newServerNewAddressResponse(0),
@@ -166,21 +176,21 @@ func TestNewAddressValidatesServerResponse(t *testing.T) {
 			resp: newServerNewAddressResponse(
 				wire.SequenceLockTimeIsSeconds | 1,
 			),
-			expected: "invalid static address CSV flags",
+			expected: "static address expiry does not fit into CSV",
 		},
 		{
 			name: "disabled flag",
 			resp: newServerNewAddressResponse(
 				wire.SequenceLockTimeDisabled | 1,
 			),
-			expected: "invalid static address CSV flags",
+			expected: "static address expiry does not fit into CSV",
 		},
 		{
 			name: "reserved flag",
 			resp: newServerNewAddressResponse(
 				wire.SequenceLockTimeMask + 1,
 			),
-			expected: "invalid static address CSV flags",
+			expected: "static address expiry does not fit into CSV",
 		},
 		{
 			name: "too large",
@@ -305,6 +315,8 @@ func NewAddressManagerTestContextWithResponse(t *testing.T,
 	}
 }
 
+// newServerNewAddressResponse returns a valid server response with the given
+// CSV expiry.
 func newServerNewAddressResponse(expiry uint32) *swapserverrpc.ServerNewAddressResponse {
 	return &swapserverrpc.ServerNewAddressResponse{
 		Params: &swapserverrpc.ServerAddressParameters{