Update CDS URLs.

SignalServiceKit/src/Contacts/ContactDiscoveryService.h

@@ -33,7 +33,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (instancetype)init NS_UNAVAILABLE;
 
-+ (instancetype)sharedService;
++ (instancetype)shared;
 
 - (void)testService;
 - (void)performRemoteAttestationWithSuccess:(void (^)(RemoteAttestation *_Nonnull remoteAttestation))successHandler

SignalServiceKit/src/Contacts/ContactDiscoveryService.m

@@ -237,7 +237,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @implementation ContactDiscoveryService
 
-+ (instancetype)sharedService {
++ (instancetype)shared
+{
     static dispatch_once_t onceToken;
     static id sharedInstance = nil;
     dispatch_once(&onceToken, ^{

SignalServiceKit/src/Network/API/Requests/OWSRequestFactory.m

@@ -282,8 +282,7 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssertDebug(authUsername.length > 0);
     OWSAssertDebug(authPassword.length > 0);
 
-    NSString *path =
-        [NSString stringWithFormat:@"https://api.contact-discovery.acton-signal.org/v1/attestation/%@", enclaveId];
+    NSString *path = [NSString stringWithFormat:@"%@/v1/attestation/%@", contactDiscoveryURL, enclaveId];
     TSRequest *request = [TSRequest requestWithUrl:[NSURL URLWithString:path]
                                             method:@"PUT"
                                         parameters:@{
@@ -306,8 +305,7 @@ NS_ASSUME_NONNULL_BEGIN
                                        authPassword:(NSString *)authPassword
                                             cookies:(NSArray<NSHTTPCookie *> *)cookies
 {
-    NSString *path =
-        [NSString stringWithFormat:@"https://api.contact-discovery.acton-signal.org/v1/discovery/%@", enclaveId];
+    NSString *path = [NSString stringWithFormat:@"%@/v1/discovery/%@", contactDiscoveryURL, enclaveId];
 
     TSRequest *request = [TSRequest requestWithUrl:[NSURL URLWithString:path]
                                             method:@"PUT"

SignalServiceKit/src/TSConstants.h

@@ -33,6 +33,7 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) {
 // Use same reflector for service and CDN
 #define textSecureServiceReflectorHost @"textsecure-service-reflected.whispersystems.org"
 #define textSecureCDNReflectorHost @"textsecure-service-reflected.whispersystems.org"
+#define contactDiscoveryURL @"https://api.directory.signal.org"
 
 //#else
 //
@@ -42,6 +43,7 @@ typedef NS_ENUM(NSInteger, TSWhisperMessageType) {
 //#define textSecureCDNServerURL @"https://cdn-staging.signal.org"
 //#define textSecureServiceReflectorHost @"meek-signal-service-staging.appspot.com";
 //#define textSecureCDNReflectorHost @"meek-signal-cdn-staging.appspot.com";
+//#define contactDiscoveryURL @"https://api-staging.directory.signal.org"
 //
 //#endif