Fix Jetty start script (#2958)

Script broken by inlined comment in multi-line command with backslash.

Refactored into comment-safe format.

core/src/main/java/google/registry/config/RegistryConfig.java

@@ -143,15 +143,15 @@ public final class RegistryConfig {
     }
 
     /**
-     * Returns the roid suffix to be used for the roids of all contacts and hosts. E.g. a value of
-     * "ROID" would end up creating roids that look like "ABC123-ROID".
+     * Returns the roid suffix to be used for the roids of all hosts. E.g. a value of "ROID" would
+     * end up creating roids that look like "ABC123-ROID".
      *
      * @see <a href="http://www.iana.org/assignments/epp-repository-ids/epp-repository-ids.xhtml">
      *     Extensible Provisioning Protocol (EPP) Repository Identifiers</a>
      */
     @Provides
-    @Config("contactAndHostRoidSuffix")
-    public static String provideContactAndHostRoidSuffix(RegistryConfigSettings config) {
+    @Config("hostRoidSuffix")
+    public static String provideHostRoidSuffix(RegistryConfigSettings config) {
       return config.registryPolicy.contactAndHostRoidSuffix;
     }
 
@@ -1024,18 +1024,6 @@ public final class RegistryConfig {
       return Duration.standardSeconds(config.monitoring.writeIntervalSeconds);
     }
 
-    /**
-     * The global automatic transfer length for contacts. After this amount of time has elapsed, the
-     * transfer is automatically approved.
-     *
-     * @see google.registry.flows.contact.ContactTransferRequestFlow
-     */
-    @Provides
-    @Config("contactAutomaticTransferLength")
-    public static Duration provideContactAutomaticTransferLength(RegistryConfigSettings config) {
-      return Duration.standardDays(config.registryPolicy.contactAutomaticTransferDays);
-    }
-
     /**
      * Returns the maximum number of entities that can be checked at one time in an EPP check flow.
      */
@@ -1623,15 +1611,11 @@ public final class RegistryConfig {
     return CONFIG_SETTINGS.get().hibernate.jdbcFetchSize;
   }
 
-  /** Returns the roid suffix to be used for the roids of all contacts and hosts. */
-  public static String getContactAndHostRoidSuffix() {
+  /** Returns the roid suffix to be used for the roids of all hosts. */
+  public static String getHostRoidSuffix() {
     return CONFIG_SETTINGS.get().registryPolicy.contactAndHostRoidSuffix;
   }
 
-  /** Returns the global automatic transfer length for contacts. */
-  public static Duration getContactAutomaticTransferLength() {
-    return Duration.standardDays(CONFIG_SETTINGS.get().registryPolicy.contactAutomaticTransferDays);
-  }
 
   /** A discount for all sunrise domain creates, between 0.0 (no discount) and 1.0 (free). */
   public static double getSunriseDomainCreateDiscount() {

core/src/main/java/google/registry/config/RegistryConfigSettings.java

@@ -86,7 +86,6 @@ public class RegistryConfigSettings {
     public String productName;
     public String customLogicFactoryClass;
     public String dnsCountQueryCoordinatorClass;
-    public int contactAutomaticTransferDays;
     public String greetingServerId;
     public List<String> registrarChangesNotificationEmailAddresses;
     public String defaultRegistrarWhoisServer;

core/src/main/java/google/registry/config/files/default-config.yaml

@@ -63,9 +63,6 @@ registryPolicy:
   # See reporting/icann/DnsCountQueryCoordinator.java
   dnsCountQueryCoordinatorClass: google.registry.reporting.icann.DummyDnsCountQueryCoordinator
 
-  # Length of time after which contact transfers automatically conclude.
-  contactAutomaticTransferDays: 5
-
   # Server ID used in the 'svID' element of an EPP 'greeting'.
   greetingServerId: Nomulus Registry
 

core/src/main/java/google/registry/flows/FeeExtensionXmlTagNormalizer.java

@@ -0,0 +1,128 @@
+// Copyright 2026 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.package google.registry.flows;
+
+package google.registry.flows;
+
+import static google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension.FEE_0_11;
+import static google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension.FEE_0_12;
+import static google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension.FEE_0_6;
+import static google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension.FEE_1_00;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableSet;
+import google.registry.model.eppcommon.EppXmlTransformer;
+import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+/**
+ * Normalizes Fee extension namespace tags in EPP XML response messages.
+ *
+ * <p>Nomulus currently supports multiple versions of the Fee extension. With the current XML
+ * tooling, the namespace of every version is included in each EPP response, and as a result must
+ * use a unique XML tag. E.g., fee for extension v0.6, and fee12 for extension v0.12.
+ *
+ * <p>Some registrars are not XML namespace-aware and rely on the XML tags being specific literals.
+ * This makes it difficult to perform seamless rollout of new versions: if Nomulus reassigns a tag
+ * literal to a different version, it effectively forces all these registrars to upgrade at the time
+ * of the deployment.
+ *
+ * <p>This class can be used to normalize the namespace tag in EPP responses. Since every response
+ * message may use at most one version of the Fee extension, we can remove declared but unused
+ * versions from the message, thus freeing up the canonical tag ('fee') for the active version.
+ */
+public class FeeExtensionXmlTagNormalizer {
+
+  // So far we only have Fee extensions to process
+  private static final String CANONICAL_FEE_TAG = "fee";
+
+  private static final ImmutableSet<ServiceExtension> FEE_EXTENSIONS =
+      ImmutableSet.of(FEE_0_6, FEE_0_11, FEE_0_12, FEE_1_00);
+
+  private static final Pattern FEE_EXTENSION_IN_USE_PATTERN =
+      Pattern.compile(feeExtensionInUseRegex());
+
+  @VisibleForTesting
+  static String feeExtensionInUseRegex() {
+    return FEE_EXTENSIONS.stream()
+        .map(ServiceExtension::getXmlTag)
+        .map(tag -> String.format("\\b(%s):", tag))
+        .collect(Collectors.joining("|"));
+  }
+
+  /**
+   * Returns a EPP response that uses the canonical tag ({@code fee}) for the fee extension.
+   *
+   * <p>This method replaces any versioned tag, e.g., {@code fee12} with the canonical tag. It also
+   * removes unused namespace declarations and update the tag in the remaining declaration.
+   *
+   * <p>The input {@code xml} must be an EPP response message generated by the {@link
+   * EppXmlTransformer}. With this assumption, we can use regular expressions which is 10X faster
+   * than XML stream parsers.
+   */
+  public static String normalize(String xml) {
+    Optional<String> maybeFeeTagInUse = findFeeExtensionInUse(xml);
+    if (maybeFeeTagInUse.isEmpty()) {
+      return xml;
+    }
+    String feeTagInUse = maybeFeeTagInUse.get();
+    String normalized = xml;
+    for (ServiceExtension serviceExtension : FEE_EXTENSIONS) {
+      if (serviceExtension.getXmlTag().equals(feeTagInUse)) {
+        normalized = normalizeExtensionInUse(feeTagInUse, serviceExtension.getUri(), normalized);
+      } else {
+        normalized =
+            removeUnusedExtension(
+                serviceExtension.getXmlTag(), serviceExtension.getUri(), normalized);
+      }
+    }
+    return normalized;
+  }
+
+  static String removeUnusedExtension(String tag, String uri, String xml) {
+    String declaration = String.format("xmlns:%s=\"%s\"", tag, uri);
+    // There must be a leading whitespace, and it can be safely removed with the declaration.
+    return xml.replaceAll(String.format("\\s%s", declaration), "");
+  }
+
+  static String normalizeExtensionInUse(String tagInUse, String uriInUse, String xml) {
+    if (tagInUse.equals(CANONICAL_FEE_TAG)) {
+      return xml;
+    }
+    // Change the tag in the namespace declaration:
+    String currentDeclaration = String.format("xmlns:%s=\"%s\"", tagInUse, uriInUse);
+    String desiredDeclaraion = String.format("xmlns:fee=\"%s\"", uriInUse);
+    // The new tag at each site of use, with trailing colon:
+    String newTagWithColon = CANONICAL_FEE_TAG + ":";
+    return xml.replaceAll(String.format("\\b%s:", tagInUse), newTagWithColon)
+        .replaceAll(currentDeclaration, desiredDeclaraion);
+  }
+
+  static Optional<String> findFeeExtensionInUse(String xml) {
+    Matcher matcher = FEE_EXTENSION_IN_USE_PATTERN.matcher(xml);
+
+    if (!matcher.find()) {
+      return Optional.empty();
+    }
+    // We know only one extension is in use, so we can return on the first match
+    for (int i = 1; i <= matcher.groupCount(); i++) {
+      if (matcher.group(i) != null) {
+        return Optional.of(matcher.group(i));
+      }
+    }
+    throw new IllegalStateException("Should not reach here. Bad FEE_EXTENSION_IN_USE_PATTERN?");
+  }
+}

core/src/main/java/google/registry/flows/host/HostCreateFlow.java

@@ -87,7 +87,7 @@ public final class HostCreateFlow implements MutatingFlow {
   @Inject EppResponse.Builder responseBuilder;
 
   @Inject
-  @Config("contactAndHostRoidSuffix")
+  @Config("hostRoidSuffix")
   String roidSuffix;
 
   @Inject

core/src/main/java/google/registry/flows/session/LoginFlow.java

@@ -15,6 +15,7 @@
 package google.registry.flows.session;
 
 import static com.google.common.collect.Sets.difference;
+import static google.registry.model.common.FeatureFlag.FeatureName.PROHIBIT_CONTACT_OBJECTS_ON_LOGIN;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.util.CollectionUtils.nullToEmpty;
 
@@ -39,6 +40,7 @@ import google.registry.flows.TlsCredentials.BadRegistrarIpAddressException;
 import google.registry.flows.TlsCredentials.MissingRegistrarCertificateException;
 import google.registry.flows.TransportCredentials;
 import google.registry.flows.TransportCredentials.BadRegistrarPasswordException;
+import google.registry.model.common.FeatureFlag;
 import google.registry.model.eppcommon.ProtocolDefinition;
 import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension;
 import google.registry.model.eppinput.EppInput;
@@ -114,9 +116,13 @@ public class LoginFlow implements MutatingFlow {
     }
     Services services = login.getServices();
     stopwatch.tick("LoginFlow getServices");
-    Set<String> unsupportedObjectServices = difference(
-        nullToEmpty(services.getObjectServices()),
-        ProtocolDefinition.SUPPORTED_OBJECT_SERVICES);
+
+    Set<String> unsupportedObjectServices =
+        difference(
+            nullToEmpty(services.getObjectServices()),
+            FeatureFlag.isActiveNow(PROHIBIT_CONTACT_OBJECTS_ON_LOGIN)
+                ? ProtocolDefinition.SUPPORTED_OBJECT_SERVICES
+                : ProtocolDefinition.SUPPORTED_OBJECT_SERVICES_WITH_CONTACT);
     stopwatch.tick("LoginFlow difference unsupportedObjectServices");
     if (!unsupportedObjectServices.isEmpty()) {
       throw new UnimplementedObjectServiceException();

core/src/main/java/google/registry/model/common/FeatureFlag.java

@@ -64,6 +64,7 @@ public class FeatureFlag extends ImmutableObject implements Buildable {
 
   /** The names of the feature flags that can be individually set. */
   public enum FeatureName {
+
     /** Feature flag name used for testing only. */
     TEST_FEATURE(FeatureStatus.INACTIVE),
 
@@ -76,7 +77,10 @@ public class FeatureFlag extends ImmutableObject implements Buildable {
     /**
      * If we're including the upcoming domain drop date in the exported list of registered domains.
      */
-    INCLUDE_PENDING_DELETE_DATE_FOR_DOMAINS(FeatureStatus.INACTIVE);
+    INCLUDE_PENDING_DELETE_DATE_FOR_DOMAINS(FeatureStatus.INACTIVE),
+
+    /** If we're prohibiting the inclusion of the contact object URI on login. */
+    PROHIBIT_CONTACT_OBJECTS_ON_LOGIN(FeatureStatus.INACTIVE);
 
     private final FeatureStatus defaultStatus;
 

core/src/main/java/google/registry/model/eppcommon/ProtocolDefinition.java

@@ -18,6 +18,7 @@ import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static com.google.common.collect.Maps.uniqueIndex;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.VerifyException;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import google.registry.model.domain.fee06.FeeCheckCommandExtensionV06;
@@ -46,10 +47,13 @@ public class ProtocolDefinition {
   public static final String LANGUAGE = "en";
 
   public static final ImmutableSet<String> SUPPORTED_OBJECT_SERVICES =
-      ImmutableSet.of(
-          "urn:ietf:params:xml:ns:host-1.0",
-          "urn:ietf:params:xml:ns:domain-1.0",
-          "urn:ietf:params:xml:ns:contact-1.0");
+      ImmutableSet.of("urn:ietf:params:xml:ns:host-1.0", "urn:ietf:params:xml:ns:domain-1.0");
+
+  public static final ImmutableSet<String> SUPPORTED_OBJECT_SERVICES_WITH_CONTACT =
+      new ImmutableSet.Builder<String>()
+          .addAll(SUPPORTED_OBJECT_SERVICES)
+          .add("urn:ietf:params:xml:ns:contact-1.0")
+          .build();
 
   /** Enum representing which environments should have which service extensions enabled. */
   private enum ServiceExtensionVisibility {
@@ -84,6 +88,7 @@ public class ProtocolDefinition {
     private final Class<? extends CommandExtension> commandExtensionClass;
     private final Class<? extends ResponseExtension> responseExtensionClass;
     private final String uri;
+    private final String xmlTag;
     private final ServiceExtensionVisibility visibility;
 
     ServiceExtension(
@@ -93,6 +98,7 @@ public class ProtocolDefinition {
       this.commandExtensionClass = commandExtensionClass;
       this.responseExtensionClass = responseExtensionClass;
       this.uri = getCommandExtensionUri(commandExtensionClass);
+      this.xmlTag = getCommandExtensionXmlTag(commandExtensionClass);
       this.visibility = visibility;
     }
 
@@ -108,11 +114,27 @@ public class ProtocolDefinition {
       return uri;
     }
 
+    public String getXmlTag() {
+      return xmlTag;
+    }
+
     /** Returns the namespace URI of the command extension class. */
     public static String getCommandExtensionUri(Class<? extends CommandExtension> clazz) {
       return clazz.getPackage().getAnnotation(XmlSchema.class).namespace();
     }
 
+    /** Returns the XML tag for this extension in the response message. */
+    public static String getCommandExtensionXmlTag(Class<? extends CommandExtension> clazz) {
+      var xmlSchema = clazz.getPackage().getAnnotation(XmlSchema.class);
+      var xmlns = xmlSchema.xmlns();
+      if (xmlns == null || xmlns.length != 1) {
+        throw new VerifyException(
+            String.format(
+                "Expecting exactly one NS declaration in %s", clazz.getPackage().getName()));
+      }
+      return xmlns[0].prefix();
+    }
+
     public boolean isVisible() {
       return switch (visibility) {
         case ALL -> true;

core/src/main/java/google/registry/privileges/secretmanager/SqlCredentialStore.java

@@ -14,28 +14,12 @@
 
 package google.registry.privileges.secretmanager;
 
-import com.google.cloud.secretmanager.v1.SecretVersionName;
 import google.registry.config.RegistryConfig.Config;
-import google.registry.privileges.secretmanager.SecretManagerClient.NoSuchSecretResourceException;
 import jakarta.inject.Inject;
 import java.util.Optional;
 
 /**
  * Storage of SQL users' login credentials, backed by Cloud Secret Manager.
- *
- * <p>A user's credential is stored with one level of indirection using two secret IDs: Each version
- * of the <em>credential data</em> is stored as follows: its secret ID is determined by {@link
- * #getCredentialDataSecretId(SqlUser, String dbInstance)}, and the value of each version is a
- * {@link SqlCredential}, serialized using {@link SqlCredential#toFormattedString}. The 'live'
- * version of the credential is saved under the 'live pointer' secret explained below.
- *
- * <p>The pointer to the 'live' version of the credential data is stored as follows: its secret ID
- * is determined by {@link #getLiveLabelSecretId(SqlUser, String dbInstance)}; and the value of each
- * version is a {@link SecretVersionName} in String form, pointing to a version of the credential
- * data. Only the 'latest' version of this secret should be used. It is guaranteed to be valid.
- *
- * <p>The indirection in credential storage makes it easy to handle failures in the credential
- * change process.
  */
 public class SqlCredentialStore {
   private final SecretManagerClient csmClient;
@@ -49,61 +33,19 @@ public class SqlCredentialStore {
   }
 
   public SqlCredential getCredential(SqlUser user) {
-    SecretVersionName credentialName = getLiveCredentialSecretVersion(user);
-    return SqlCredential.fromFormattedString(
-        csmClient.getSecretData(
-            credentialName.getSecret(), Optional.of(credentialName.getSecretVersion())));
+    var secretId = getSecretIdForUserPassword(user);
+    var secretData = csmClient.getSecretData(secretId, Optional.empty());
+    return SqlCredential.fromFormattedString(secretData);
   }
 
   public void createOrUpdateCredential(SqlUser user, String password) {
-    SecretVersionName dataName = saveCredentialData(user, password);
-    saveLiveLabel(user, dataName);
+    var secretId = getSecretIdForUserPassword(user);
+    csmClient.createSecretIfAbsent(secretId);
+    csmClient.addSecretVersion(
+        secretId, SqlCredential.create(user.geUserName(), password).toFormattedString());
   }
 
-  public void deleteCredential(SqlUser user) {
-    try {
-      csmClient.deleteSecret(getCredentialDataSecretId(user, dbInstance));
-    } catch (NoSuchSecretResourceException e) {
-      // ok
-    }
-    try {
-      csmClient.deleteSecret(getLiveLabelSecretId(user, dbInstance));
-    } catch (NoSuchSecretResourceException e) {
-      // ok.
-    }
-  }
-
-  private SecretVersionName saveCredentialData(SqlUser user, String password) {
-    String credentialDataSecretId = getCredentialDataSecretId(user, dbInstance);
-    csmClient.createSecretIfAbsent(credentialDataSecretId);
-    String credentialVersion =
-        csmClient.addSecretVersion(
-            credentialDataSecretId,
-            SqlCredential.create(createDatabaseLoginName(user), password).toFormattedString());
-    return SecretVersionName.of(csmClient.getProject(), credentialDataSecretId, credentialVersion);
-  }
-
-  private void saveLiveLabel(SqlUser user, SecretVersionName dataVersionName) {
-    String liveLabelSecretId = getLiveLabelSecretId(user, dbInstance);
-    csmClient.createSecretIfAbsent(liveLabelSecretId);
-    csmClient.addSecretVersion(liveLabelSecretId, dataVersionName.toString());
-  }
-
-  private SecretVersionName getLiveCredentialSecretVersion(SqlUser user) {
-    return SecretVersionName.parse(
-        csmClient.getSecretData(getLiveLabelSecretId(user, dbInstance), Optional.empty()));
-  }
-
-  private static String getLiveLabelSecretId(SqlUser user, String dbInstance) {
-    return String.format("sql-cred-live-label-%s-%s", user.geUserName(), dbInstance);
-  }
-
-  private static String getCredentialDataSecretId(SqlUser user, String dbInstance) {
-    return String.format("sql-cred-data-%s-%s", user.geUserName(), dbInstance);
-  }
-
-  // WIP: when b/170230882 is complete, login will be versioned.
-  private static String createDatabaseLoginName(SqlUser user) {
-    return user.geUserName();
+  private String getSecretIdForUserPassword(SqlUser user) {
+    return String.format("sql-password-for-%s-on-%s", user.geUserName(), this.dbInstance);
   }
 }

core/src/main/java/google/registry/tools/CreateDomainCommand.java

@@ -85,9 +85,6 @@ final class CreateDomainCommand extends CreateOrUpdateDomainCommand {
               "domain", domain,
               "period", period,
               "nameservers", nameservers,
-              "registrant", registrant,
-              "admins", admins,
-              "techs", techs,
               "password", password,
               "currency", currency,
               "price", cost,

core/src/main/java/google/registry/tools/CreateOrUpdateDomainCommand.java

@@ -21,7 +21,6 @@ import com.beust.jcommander.Parameter;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSet;
 import google.registry.tools.params.NameserversParameter;
-import google.registry.tools.params.StringListParameter;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -47,24 +46,6 @@ abstract class CreateOrUpdateDomainCommand extends MutatingEppToolCommand {
       validateWith = NameserversParameter.class)
   Set<String> nameservers = new HashSet<>();
 
-  @Parameter(
-    names = {"-r", "--registrant"},
-    description = "Domain registrant."
-  )
-  String registrant;
-
-  @Parameter(
-      names = {"-a", "--admins"},
-      description = "Comma-separated list of admin contacts.",
-      listConverter = StringListParameter.class)
-  List<String> admins = new ArrayList<>();
-
-  @Parameter(
-      names = {"-t", "--techs"},
-      description = "Comma-separated list of technical contacts.",
-      listConverter = StringListParameter.class)
-  List<String> techs = new ArrayList<>();
-
   @Parameter(
     names = {"-p", "--password"},
     description = "Password."

core/src/main/java/google/registry/tools/CreateOrUpdateRegistrarCommand.java

@@ -400,7 +400,10 @@ abstract class CreateOrUpdateRegistrarCommand extends MutatingCommand {
       if (registrarName != null && !registrarName.equals(oldRegistrarName)) {
         String normalizedName = normalizeRegistrarName(registrarName);
         for (Registrar registrar : Registrar.loadAll()) {
-          if (registrar.getRegistrarName() != null) {
+          // Only check against other registrars (i.e. not the existing version of this one), and
+          // which also have a display name set.
+          if (!registrar.getRegistrarId().equals(clientId)
+              && registrar.getRegistrarName() != null) {
             checkArgument(
                 !normalizedName.equals(normalizeRegistrarName(registrar.getRegistrarName())),
                 "The registrar name %s normalizes identically to existing registrar name %s",

core/src/main/java/google/registry/tools/UpdateDomainCommand.java

@@ -15,11 +15,9 @@
 package google.registry.tools;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
 import static google.registry.model.domain.rgp.GracePeriodStatus.AUTO_RENEW;
 import static google.registry.model.eppcommon.StatusValue.PENDING_DELETE;
 import static google.registry.model.eppcommon.StatusValue.SERVER_UPDATE_PROHIBITED;
-import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static java.util.function.Predicate.isEqual;
 
 import com.beust.jcommander.Parameter;
@@ -30,7 +28,6 @@ import com.google.common.collect.Sets;
 import com.google.common.flogger.FluentLogger;
 import com.google.template.soy.data.SoyMapData;
 import google.registry.flows.ResourceFlowUtils;
-import google.registry.model.domain.DesignatedContact;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.GracePeriodBase;
 import google.registry.model.eppcommon.StatusValue;
@@ -66,15 +63,6 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
       validateWith = NameserversParameter.class)
   private Set<String> addNameservers = new HashSet<>();
 
-  // TODO(b/184067241): enforce only one of each type of contact
-  @Parameter(
-      names = "--add_admins",
-      description = "Admins to add. Cannot be set if --admins is set.")
-  private List<String> addAdmins = new ArrayList<>();
-
-  @Parameter(names = "--add_techs", description = "Techs to add. Cannot be set if --techs is set.")
-  private List<String> addTechs = new ArrayList<>();
-
   @Parameter(
     names = "--add_statuses",
     description = "Statuses to add. Cannot be set if --statuses is set."
@@ -97,18 +85,6 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
       validateWith = NameserversParameter.class)
   private Set<String> removeNameservers = new HashSet<>();
 
-  @Parameter(
-    names = "--remove_admins",
-    description = "Admins to remove. Cannot be set if --admins is set."
-  )
-  private List<String> removeAdmins = new ArrayList<>();
-
-  @Parameter(
-    names = "--remove_techs",
-    description = "Techs to remove. Cannot be set if --techs is set."
-  )
-  private List<String> removeTechs = new ArrayList<>();
-
   @Parameter(
     names = "--remove_statuses",
     description = "Statuses to remove. Cannot be set if --statuses is set."
@@ -154,16 +130,6 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
     } else {
       checkArgument(addNameservers.size() <= 13, "You can add at most 13 nameservers.");
     }
-    if (!admins.isEmpty()) {
-      checkArgument(
-          addAdmins.isEmpty() && removeAdmins.isEmpty(),
-          "If you provide the admins flag, you cannot use the add_admins and remove_admins flags.");
-    }
-    if (!techs.isEmpty()) {
-      checkArgument(
-          addTechs.isEmpty() && removeTechs.isEmpty(),
-          "If you provide the techs flag, you cannot use the add_techs and remove_techs flags.");
-    }
     if (!statuses.isEmpty()) {
       checkArgument(
           addStatuses.isEmpty() && removeStatuses.isEmpty(),
@@ -197,16 +163,12 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
           domainName);
 
       // Use TreeSets so that the results are always in the same order (this makes testing easier).
-      Set<String> addAdminsThisDomain = new TreeSet<>(addAdmins);
-      Set<String> removeAdminsThisDomain = new TreeSet<>(removeAdmins);
-      Set<String> addTechsThisDomain = new TreeSet<>(addTechs);
-      Set<String> removeTechsThisDomain = new TreeSet<>(removeTechs);
       Set<String> addNameserversThisDomain = new TreeSet<>(addNameservers);
       Set<String> removeNameserversThisDomain = new TreeSet<>(removeNameservers);
       Set<String> addStatusesThisDomain = new TreeSet<>(addStatuses);
       Set<String> removeStatusesThisDomain = new TreeSet<>(removeStatuses);
 
-      if (!nameservers.isEmpty() || !admins.isEmpty() || !techs.isEmpty() || !statuses.isEmpty()) {
+      if (!nameservers.isEmpty() || !statuses.isEmpty()) {
         if (!nameservers.isEmpty()) {
           ImmutableSortedSet<String> existingNameservers = domain.loadNameserverHostNames();
           populateAddRemoveLists(
@@ -223,27 +185,7 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
               "The resulting nameservers count for domain %s would be more than 13",
               domainName);
         }
-        if (!admins.isEmpty() || !techs.isEmpty()) {
-          ImmutableSet<String> existingAdmins =
-              getContactsOfType(domain, DesignatedContact.Type.ADMIN);
-          ImmutableSet<String> existingTechs =
-              getContactsOfType(domain, DesignatedContact.Type.TECH);
 
-          if (!admins.isEmpty()) {
-            populateAddRemoveLists(
-                ImmutableSet.copyOf(admins),
-                existingAdmins,
-                addAdminsThisDomain,
-                removeAdminsThisDomain);
-          }
-          if (!techs.isEmpty()) {
-            populateAddRemoveLists(
-                ImmutableSet.copyOf(techs),
-                existingTechs,
-                addTechsThisDomain,
-                removeTechsThisDomain);
-          }
-        }
         if (!statuses.isEmpty()) {
           Set<String> currentStatusValues = new HashSet<>();
           for (StatusValue statusValue : domain.getStatusValues()) {
@@ -259,17 +201,13 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
 
       boolean add =
           (!addNameserversThisDomain.isEmpty()
-              || !addAdminsThisDomain.isEmpty()
-              || !addTechsThisDomain.isEmpty()
               || !addStatusesThisDomain.isEmpty());
 
       boolean remove =
           (!removeNameserversThisDomain.isEmpty()
-              || !removeAdminsThisDomain.isEmpty()
-              || !removeTechsThisDomain.isEmpty()
               || !removeStatusesThisDomain.isEmpty());
 
-      boolean change = (registrant != null || password != null);
+      boolean change = password != null;
       boolean secDns =
           (!addDsRecords.isEmpty()
               || !removeDsRecords.isEmpty()
@@ -297,16 +235,11 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
               "domain", domainName,
               "add", add,
               "addNameservers", addNameserversThisDomain,
-              "addAdmins", addAdminsThisDomain,
-              "addTechs", addTechsThisDomain,
               "addStatuses", addStatusesThisDomain,
               "remove", remove,
               "removeNameservers", removeNameserversThisDomain,
-              "removeAdmins", removeAdminsThisDomain,
-              "removeTechs", removeTechsThisDomain,
               "removeStatuses", removeStatusesThisDomain,
               "change", change,
-              "registrant", registrant,
               "password", password,
               "secdns", secDns,
               "addDsRecords", DsRecord.convertToSoy(addDsRecords),
@@ -337,13 +270,4 @@ final class UpdateDomainCommand extends CreateOrUpdateDomainCommand {
     addSet.addAll(Sets.difference(targetSet, oldSet));
     removeSet.addAll(Sets.difference(oldSet, targetSet));
   }
-
-  ImmutableSet<String> getContactsOfType(Domain domain, final DesignatedContact.Type contactType) {
-    return tm().transact(
-            () ->
-                domain.getContacts().stream()
-                    .filter(contact -> contact.getType().equals(contactType))
-                    .map(contact -> tm().loadByKey(contact.getContactKey()).getContactId())
-                    .collect(toImmutableSet()));
-  }
 }

core/src/main/resources/google/registry/tools/soy/DomainUpdate.soy

@@ -20,16 +20,11 @@
   {@param domain: string}
   {@param add: bool}
   {@param addNameservers: list<string>}
-  {@param addAdmins: list<string>}
-  {@param addTechs: list<string>}
   {@param addStatuses: list<string>}
   {@param remove: bool}
   {@param removeNameservers: list<string>}
-  {@param removeAdmins: list<string>}
-  {@param removeTechs: list<string>}
   {@param removeStatuses: list<string>}
   {@param change: bool}
-  {@param? registrant: string|null}
   {@param? password: string|null}
   {@param secdns: bool}
   {@param addDsRecords: list<[keyTag:int, alg:int, digestType:int, digest:string]>}
@@ -54,12 +49,6 @@
                   {/for}
                 </domain:ns>
               {/if}
-              {for $admin in $addAdmins}
-                <domain:contact type="admin">{$admin}</domain:contact>
-              {/for}
-              {for $tech in $addTechs}
-                <domain:contact type="tech">{$tech}</domain:contact>
-              {/for}
               {for $status in $addStatuses}
                 <domain:status s="{$status}"/>
               {/for}
@@ -74,12 +63,6 @@
                   {/for}
                 </domain:ns>
               {/if}
-              {for $admin in $removeAdmins}
-                <domain:contact type="admin">{$admin}</domain:contact>
-              {/for}
-              {for $tech in $removeTechs}
-                <domain:contact type="tech">{$tech}</domain:contact>
-              {/for}
               {for $status in $removeStatuses}
                 <domain:status s="{$status}"/>
               {/for}
@@ -87,9 +70,6 @@
           {/if}
           {if $change}
             <domain:chg>
-              {if $registrant}
-                <domain:registrant>{$registrant}</domain:registrant>
-              {/if}
               {if $password}
                 <domain:authInfo>
                     <domain:pw>{$password}</domain:pw>

core/src/test/java/google/registry/flows/FeeExtensionXmlTagNormalizerTest.java

@@ -0,0 +1,78 @@
+// Copyright 2026 The Nomulus Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.package google.registry.flows;
+
+package google.registry.flows;
+
+import static com.google.common.truth.Truth.assertThat;
+import static google.registry.flows.FeeExtensionXmlTagNormalizer.feeExtensionInUseRegex;
+import static google.registry.flows.FeeExtensionXmlTagNormalizer.normalize;
+import static google.registry.model.eppcommon.EppXmlTransformer.validateOutput;
+import static google.registry.testing.TestDataHelper.loadFile;
+
+import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+class FeeExtensionXmlTagNormalizerTest {
+
+  @Test
+  void feeExtensionInUseRegex_correct() {
+    assertThat(feeExtensionInUseRegex())
+        .isEqualTo("\\b(fee):|\\b(fee11):|\\b(fee12):|\\b(fee_1_00):");
+  }
+
+  @Test
+  void normalize_noFeeExtensions() throws Exception {
+    String xml = loadFile(getClass(), "domain_create.xml");
+    String normalized = normalize(xml);
+    assertThat(normalized).isEqualTo(xml);
+  }
+
+  @ParameterizedTest(name = "normalize_withFeeExtension-{0}")
+  @MethodSource("provideTestCombinations")
+  @SuppressWarnings("unused") // Parameter 'name' is part of test case name
+  void normalize_withFeeExtension(String name, String inputXmlFilename, String expectedXmlFilename)
+      throws Exception {
+    String original = loadFile(getClass(), inputXmlFilename);
+    String normalized = normalize(original);
+    String expected = loadFile(getClass(), expectedXmlFilename);
+    // Verify that expected xml is syntatically correct.
+    validateOutput(expected);
+
+    assertThat(normalized).isEqualTo(expected);
+  }
+
+  @SuppressWarnings("unused")
+  static Stream<Arguments> provideTestCombinations() {
+    return Stream.of(
+        Arguments.of(
+            "v06",
+            "domain_check_fee_response_raw_v06.xml",
+            "domain_check_fee_response_normalized_v06.xml"),
+        Arguments.of(
+            "v11",
+            "domain_check_fee_response_raw_v11.xml",
+            "domain_check_fee_response_normalized_v11.xml"),
+        Arguments.of(
+            "v12",
+            "domain_check_fee_response_raw_v12.xml",
+            "domain_check_fee_response_normalized_v12.xml"),
+        Arguments.of(
+            "stdv1",
+            "domain_check_fee_response_raw_stdv1.xml",
+            "domain_check_fee_response_normalized_stdv1.xml"));
+  }
+}

core/src/test/java/google/registry/flows/domain/DomainCheckFlowTest.java

@@ -1151,7 +1151,6 @@ class DomainCheckFlowTest extends ResourceCheckFlowTestCase<DomainCheckFlow, Dom
         .marshalsToXml();
   }
 
-
   @Test
   void testSuccess_eapFeeCheck_std_v1() throws Exception {
     runEapFeeCheckTestWithXmlInputOutput(

core/src/test/java/google/registry/flows/session/LoginFlowTestCase.java

@@ -16,14 +16,17 @@ package google.registry.flows.session;
 
 import static com.google.common.io.BaseEncoding.base64;
 import static com.google.common.truth.Truth.assertThat;
+import static google.registry.model.common.FeatureFlag.FeatureName.PROHIBIT_CONTACT_OBJECTS_ON_LOGIN;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.testing.DatabaseHelper.deleteResource;
 import static google.registry.testing.DatabaseHelper.loadRegistrar;
 import static google.registry.testing.DatabaseHelper.persistResource;
 import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions;
+import static google.registry.util.DateTimeUtils.START_OF_TIME;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSortedMap;
 import google.registry.flows.EppException;
 import google.registry.flows.EppException.UnimplementedExtensionException;
 import google.registry.flows.EppException.UnimplementedObjectServiceException;
@@ -36,6 +39,8 @@ import google.registry.flows.session.LoginFlow.BadRegistrarIdException;
 import google.registry.flows.session.LoginFlow.RegistrarAccountNotActiveException;
 import google.registry.flows.session.LoginFlow.TooManyFailedLoginsException;
 import google.registry.flows.session.LoginFlow.UnsupportedLanguageException;
+import google.registry.model.common.FeatureFlag;
+import google.registry.model.common.FeatureFlag.FeatureStatus;
 import google.registry.model.eppoutput.EppOutput;
 import google.registry.model.registrar.Registrar;
 import google.registry.model.registrar.Registrar.State;
@@ -56,6 +61,11 @@ public abstract class LoginFlowTestCase extends FlowTestCase<LoginFlow> {
     sessionMetadata.setRegistrarId(null); // Don't implicitly log in (all other flows need to).
     registrar = loadRegistrar("NewRegistrar");
     registrarBuilder = registrar.asBuilder();
+    persistResource(
+        new FeatureFlag.Builder()
+            .setFeatureName(PROHIBIT_CONTACT_OBJECTS_ON_LOGIN)
+            .setStatusMap(ImmutableSortedMap.of(START_OF_TIME, FeatureStatus.ACTIVE))
+            .build());
   }
 
   // Can't inline this since it may be overridden in subclasses.
@@ -117,6 +127,21 @@ public abstract class LoginFlowTestCase extends FlowTestCase<LoginFlow> {
     doFailingTest("login_invalid_extension.xml", UnimplementedExtensionException.class);
   }
 
+  @Test
+  void testFailure_invalidContactObjectUri() {
+    doFailingTest("login_with_contact_objuri.xml", UnimplementedObjectServiceException.class);
+  }
+
+  @Test
+  void testSuccess_contactObjectUri_worksWhenNotProhibited() throws Exception {
+    persistResource(
+        FeatureFlag.get(PROHIBIT_CONTACT_OBJECTS_ON_LOGIN)
+            .asBuilder()
+            .setStatusMap(ImmutableSortedMap.of(START_OF_TIME, FeatureStatus.INACTIVE))
+            .build());
+    doSuccessfulTest("login_with_contact_objuri.xml");
+  }
+
   @Test
   void testFailure_invalidTypes() {
     doFailingTest("login_invalid_types.xml", UnimplementedObjectServiceException.class);

core/src/test/java/google/registry/model/domain/DomainSqlTest.java

@@ -36,7 +36,6 @@ import com.google.common.collect.ImmutableSortedMap;
 import com.google.common.collect.Sets;
 import google.registry.model.billing.BillingBase.RenewalPriceBehavior;
 import google.registry.model.contact.Contact;
-import google.registry.model.domain.DesignatedContact.Type;
 import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName;
 import google.registry.model.domain.launch.LaunchNotice;
 import google.registry.model.domain.rgp.GracePeriodStatus;
@@ -53,7 +52,6 @@ import google.registry.persistence.transaction.JpaTestExtensions.JpaIntegrationW
 import google.registry.testing.FakeClock;
 import google.registry.util.SerializeUtils;
 import java.util.Arrays;
-import java.util.Optional;
 import org.joda.money.CurrencyUnit;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
@@ -71,12 +69,8 @@ public class DomainSqlTest {
       new JpaTestExtensions.Builder().withClock(fakeClock).buildIntegrationWithCoverageExtension();
 
   private Domain domain;
-  private Optional<VKey<Contact>> contactKey;
-  private VKey<Contact> contact2Key;
   private VKey<Host> host1VKey;
   private Host host;
-  private Contact contact;
-  private Contact contact2;
   private AllocationToken allocationToken;
 
   @BeforeEach
@@ -84,9 +78,6 @@ public class DomainSqlTest {
     saveRegistrar("registrar1");
     saveRegistrar("registrar2");
     saveRegistrar("registrar3");
-    contactKey = Optional.of(createKey(Contact.class, "contact_id1"));
-    contact2Key = createKey(Contact.class, "contact_id2");
-
     host1VKey = createKey(Host.class, "host1");
 
     domain =
@@ -106,8 +97,6 @@ public class DomainSqlTest {
                     StatusValue.SERVER_UPDATE_PROHIBITED,
                     StatusValue.SERVER_RENEW_PROHIBITED,
                     StatusValue.SERVER_HOLD))
-            .setRegistrant(contactKey)
-            .setContacts(ImmutableSet.of(DesignatedContact.create(Type.ADMIN, contact2Key)))
             .setSubordinateHosts(ImmutableSet.of("ns1.example.com"))
             .setPersistedCurrentSponsorRegistrarId("registrar3")
             .setRegistrationExpirationTime(fakeClock.nowUtc().plusYears(1))
@@ -128,8 +117,6 @@ public class DomainSqlTest {
             .setCreationRegistrarId("registrar1")
             .setPersistedCurrentSponsorRegistrarId("registrar2")
             .build();
-    contact = makeContact("contact_id1");
-    contact2 = makeContact("contact_id2");
 
     allocationToken =
         new AllocationToken.Builder()
@@ -168,7 +155,7 @@ public class DomainSqlTest {
   @Test
   void testHostForeignKeyConstraints() {
     // Persist the domain without the associated host object.
-    assertThrowForeignKeyViolation(() -> persistResources(contact, contact2, domain));
+    assertThrowForeignKeyViolation(() -> persistResources(domain));
   }
 
   @Test
@@ -357,7 +344,7 @@ public class DomainSqlTest {
   @Test
   void testSerializable() {
     createTld("com");
-    persistResources(contact, contact2, domain, host);
+    persistResources(domain, host);
     Domain persisted = tm().transact(() -> tm().loadByEntity(domain));
     assertThat(SerializeUtils.serializeDeserialize(persisted)).isEqualTo(persisted);
   }
@@ -365,7 +352,7 @@ public class DomainSqlTest {
   @Test
   void testUpdates() {
     createTld("com");
-    persistResources(contact, contact2, domain, host);
+    persistResources(domain, host);
     domain = domain.asBuilder().setNameservers(ImmutableSet.of()).build();
     persistResource(domain);
     assertAboutImmutableObjects()
@@ -384,7 +371,7 @@ public class DomainSqlTest {
 
   private void persistDomain() {
     createTld("com");
-    persistResources(contact, contact2, domain, host);
+    persistResources(domain, host);
   }
 
   private <T> VKey<T> createKey(Class<T> clazz, String key) {

core/src/test/java/google/registry/model/domain/DomainTest.java

@@ -23,7 +23,6 @@ import static google.registry.model.domain.token.AllocationToken.TokenType.SINGL
 import static google.registry.testing.DatabaseHelper.cloneAndSetAutoTimestamps;
 import static google.registry.testing.DatabaseHelper.createTld;
 import static google.registry.testing.DatabaseHelper.newHost;
-import static google.registry.testing.DatabaseHelper.persistActiveContact;
 import static google.registry.testing.DatabaseHelper.persistActiveDomain;
 import static google.registry.testing.DatabaseHelper.persistActiveHost;
 import static google.registry.testing.DatabaseHelper.persistResource;
@@ -49,8 +48,6 @@ import google.registry.model.billing.BillingBase.Flag;
 import google.registry.model.billing.BillingBase.Reason;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.billing.BillingRecurrence;
-import google.registry.model.contact.Contact;
-import google.registry.model.domain.DesignatedContact.Type;
 import google.registry.model.domain.fee.FeeQueryCommandExtensionItem.CommandName;
 import google.registry.model.domain.launch.LaunchNotice;
 import google.registry.model.domain.rgp.GracePeriodStatus;
@@ -91,7 +88,6 @@ public class DomainTest {
   private VKey<BillingEvent> oneTimeBillKey;
   private VKey<BillingRecurrence> recurrenceBillKey;
   private DomainHistory domainHistory;
-  private VKey<Contact> contact1Key, contact2Key;
 
   @BeforeEach
   void setUp() {
@@ -102,8 +98,6 @@ public class DomainTest {
     createTld("com");
     domain = persistActiveDomain("example.com");
     VKey<Host> hostKey = persistActiveHost("ns1.example.com").createVKey();
-    contact1Key = persistActiveContact("contact_id1").createVKey();
-    contact2Key = persistActiveContact("contact_id1").createVKey();
     domainHistory =
         persistResource(
             new DomainHistory.Builder()
@@ -185,7 +179,6 @@ public class DomainTest {
                             StatusValue.SERVER_UPDATE_PROHIBITED,
                             StatusValue.SERVER_RENEW_PROHIBITED,
                             StatusValue.SERVER_HOLD))
-                    .setRegistrant(Optional.of(contact1Key))
                     .setNameservers(ImmutableSet.of(hostKey))
                     .setSubordinateHosts(ImmutableSet.of("ns1.example.com"))
                     .setPersistedCurrentSponsorRegistrarId("NewRegistrar")
@@ -1015,51 +1008,6 @@ public class DomainTest {
     }
   }
 
-  @Test
-  void testContactFields() {
-    VKey<Contact> contact3Key = persistActiveContact("contact_id3").createVKey();
-    VKey<Contact> contact4Key = persistActiveContact("contact_id4").createVKey();
-
-    // Set all of the contacts.
-    domain.setContactFields(
-        ImmutableSet.of(
-            DesignatedContact.create(Type.REGISTRANT, contact1Key),
-            DesignatedContact.create(Type.ADMIN, contact2Key),
-            DesignatedContact.create(Type.BILLING, contact3Key),
-            DesignatedContact.create(Type.TECH, contact4Key)),
-        true);
-    assertThat(domain.getRegistrant()).hasValue(contact1Key);
-    assertThat(domain.getAdminContact()).hasValue(contact2Key);
-    assertThat(domain.getBillingContact()).hasValue(contact3Key);
-    assertThat(domain.getTechContact()).hasValue(contact4Key);
-
-    // Make sure everything gets nulled out.
-    domain.setContactFields(ImmutableSet.of(), true);
-    assertThat(domain.getRegistrant()).isEmpty();
-    assertThat(domain.getAdminContact()).isEmpty();
-    assertThat(domain.getBillingContact()).isEmpty();
-    assertThat(domain.getTechContact()).isEmpty();
-
-    // Make sure that changes don't affect the registrant unless requested.
-    domain.setContactFields(
-        ImmutableSet.of(
-            DesignatedContact.create(Type.REGISTRANT, contact1Key),
-            DesignatedContact.create(Type.ADMIN, contact2Key),
-            DesignatedContact.create(Type.BILLING, contact3Key),
-            DesignatedContact.create(Type.TECH, contact4Key)),
-        false);
-    assertThat(domain.getRegistrant()).isEmpty();
-    assertThat(domain.getAdminContact()).hasValue(contact2Key);
-    assertThat(domain.getBillingContact()).hasValue(contact3Key);
-    assertThat(domain.getTechContact()).hasValue(contact4Key);
-    domain = domain.asBuilder().setRegistrant(Optional.of(contact1Key)).build();
-    domain.setContactFields(ImmutableSet.of(), false);
-    assertThat(domain.getRegistrant()).hasValue(contact1Key);
-    assertThat(domain.getAdminContact()).isEmpty();
-    assertThat(domain.getBillingContact()).isEmpty();
-    assertThat(domain.getTechContact()).isEmpty();
-  }
-
   @Test
   void testFail_currentBulkTokenWrongTokenType() {
     AllocationToken allocationToken =

core/src/test/java/google/registry/model/eppinput/EppInputTest.java

@@ -68,10 +68,7 @@ class EppInputTest {
     assertThat(loginCommand.options.version).isEqualTo("1.0");
     assertThat(loginCommand.options.language).isEqualTo("en");
     assertThat(loginCommand.services.objectServices)
-        .containsExactly(
-            "urn:ietf:params:xml:ns:host-1.0",
-            "urn:ietf:params:xml:ns:domain-1.0",
-            "urn:ietf:params:xml:ns:contact-1.0");
+        .containsExactly("urn:ietf:params:xml:ns:host-1.0", "urn:ietf:params:xml:ns:domain-1.0");
     assertThat(loginCommand.services.serviceExtensions)
         .containsExactly("urn:ietf:params:xml:ns:launch-1.0", "urn:ietf:params:xml:ns:rgp-1.0");
   }

core/src/test/java/google/registry/privileges/secretmanager/SqlCredentialStoreTest.java

@@ -16,7 +16,6 @@ package google.registry.privileges.secretmanager;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.cloud.secretmanager.v1.SecretVersionName;
 import google.registry.privileges.secretmanager.SqlUser.RobotId;
 import google.registry.privileges.secretmanager.SqlUser.RobotUser;
 import java.util.Optional;
@@ -32,17 +31,20 @@ public class SqlCredentialStoreTest {
   @Test
   void createSecret() {
     credentialStore.createOrUpdateCredential(user, "password");
-    assertThat(client.secretExists("sql-cred-live-label-nomulus-db")).isTrue();
-    assertThat(
-            SecretVersionName.parse(
-                    client.getSecretData("sql-cred-live-label-nomulus-db", Optional.empty()))
-                .getSecret())
-        .isEqualTo("sql-cred-data-nomulus-db");
-    assertThat(client.secretExists("sql-cred-data-nomulus-db")).isTrue();
-    assertThat(client.getSecretData("sql-cred-data-nomulus-db", Optional.empty()))
+    assertThat(client.secretExists("sql-password-for-nomulus-on-db")).isTrue();
+    assertThat(client.getSecretData("sql-password-for-nomulus-on-db", Optional.empty()))
         .isEqualTo("nomulus password");
   }
 
+  @Test
+  void updateSecret() {
+    credentialStore.createOrUpdateCredential(user, "password");
+    credentialStore.createOrUpdateCredential(user, "new-password");
+    assertThat(client.secretExists("sql-password-for-nomulus-on-db")).isTrue();
+    assertThat(client.getSecretData("sql-password-for-nomulus-on-db", Optional.empty()))
+        .isEqualTo("nomulus new-password");
+  }
+
   @Test
   void getCredential() {
     credentialStore.createOrUpdateCredential(user, "password");
@@ -50,14 +52,4 @@ public class SqlCredentialStoreTest {
     assertThat(credential.login()).isEqualTo("nomulus");
     assertThat(credential.password()).isEqualTo("password");
   }
-
-  @Test
-  void deleteCredential() {
-    credentialStore.createOrUpdateCredential(user, "password");
-    assertThat(client.secretExists("sql-cred-live-label-nomulus-db")).isTrue();
-    assertThat(client.secretExists("sql-cred-data-nomulus-db")).isTrue();
-    credentialStore.deleteCredential(user);
-    assertThat(client.secretExists("sql-cred-live-label-nomulus-db")).isFalse();
-    assertThat(client.secretExists("sql-cred-data-nomulus-db")).isFalse();
-  }
 }

core/src/test/java/google/registry/rdap/RdapDomainActionTest.java

@@ -76,7 +76,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
         makeAndPersistHost(
             "ns2.cat.lol", "bad:f00d:cafe:0:0:0:15:beef", clock.nowUtc().minusYears(2));
     persistResource(
-        makeDomain("cat.lol", null, null, null, host1, host2, registrarLol)
+        makeDomain("cat.lol", host1, host2, registrarLol)
             .asBuilder()
             .setCreationTimeForTest(clock.nowUtc().minusYears(3))
             .setCreationRegistrarId("TheRegistrar")
@@ -88,7 +88,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
             "ns2.dodo.lol", "bad:f00d:cafe:0:0:0:15:beef", clock.nowUtc().minusYears(2));
     Domain domainDeleted =
         persistResource(
-            makeDomain("dodo.lol", null, null, null, host1, hostDodo2, registrarLol)
+            makeDomain("dodo.lol", host1, hostDodo2, registrarLol)
                 .asBuilder()
                 .setCreationTimeForTest(clock.nowUtc().minusYears(3))
                 .setCreationRegistrarId("TheRegistrar")
@@ -100,7 +100,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
         persistResource(makeRegistrar("idnregistrar", "IDN Registrar", Registrar.State.ACTIVE));
     persistResources(makeRegistrarPocs(registrarIdn));
     persistResource(
-        makeDomain("cat.みんな", null, null, null, host1, host2, registrarIdn)
+        makeDomain("cat.みんな", host1, host2, registrarIdn)
             .asBuilder()
             .setCreationTimeForTest(clock.nowUtc().minusYears(3))
             .setCreationRegistrarId("TheRegistrar")
@@ -113,7 +113,7 @@ class RdapDomainActionTest extends RdapActionBaseTestCase<RdapDomainAction> {
             makeRegistrar("1tldregistrar", "Multilevel Registrar", Registrar.State.ACTIVE));
     persistResources(makeRegistrarPocs(registrar1Tld));
     persistResource(
-        makeDomain("cat.1.tld", null, null, null, host1, host2, registrar1Tld)
+        makeDomain("cat.1.tld", host1, host2, registrar1Tld)
             .asBuilder()
             .setCreationTimeForTest(clock.nowUtc().minusYears(3))
             .setCreationRegistrarId("TheRegistrar")

core/src/test/java/google/registry/rdap/RdapDomainSearchActionTest.java

@@ -137,7 +137,7 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
                 "ns2.cat.lol", "bad:f00d:cafe:0:0:0:15:beef", clock.nowUtc().minusYears(2)));
     domainCatLol =
         persistResource(
-            makeDomain("cat.lol", null, null, null, hostNs1CatLol, hostNs2CatLol, registrar)
+            makeDomain("cat.lol", hostNs1CatLol, hostNs2CatLol, registrar)
                 .asBuilder()
                 .setSubordinateHosts(ImmutableSet.of("ns1.cat.lol", "ns2.cat.lol"))
                 .setCreationTimeForTest(clock.nowUtc().minusYears(3))
@@ -152,9 +152,6 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
         persistResource(
             makeDomain(
                     "cat2.lol",
-                    null,
-                    null,
-                    null,
                     addHostToMap(
                         FullFieldsTestEntityHelper.makeAndPersistHost(
                             "ns1.cat.example", "10.20.30.40", clock.nowUtc().minusYears(1))),
@@ -178,9 +175,6 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
         persistResource(
             makeDomain(
                     "cat.example",
-                    null,
-                    null,
-                    null,
                     hostNs1CatLol,
                     addHostToMap(
                         FullFieldsTestEntityHelper.makeAndPersistHost(
@@ -200,9 +194,6 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
         persistResource(
             makeDomain(
                     "cat.みんな",
-                    null,
-                    null,
-                    null,
                     addHostToMap(
                         FullFieldsTestEntityHelper.makeAndPersistHost(
                             "ns1.cat.みんな", "1.2.3.5", clock.nowUtc().minusYears(1))),
@@ -224,9 +215,6 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
         persistResource(
             makeDomain(
                     "cat.1.test",
-                    null,
-                    null,
-                    null,
                     addHostToMap(
                         FullFieldsTestEntityHelper.makeAndPersistHost(
                             "ns1.cat.1.test", "1.2.3.5", clock.nowUtc().minusYears(1))),
@@ -336,7 +324,7 @@ class RdapDomainSearchActionTest extends RdapSearchActionTestCase<RdapDomainSear
     for (int i = numActiveDomains * numTotalDomainsPerActiveDomain; i >= 1; i--) {
       String domainName = String.format("domain%d.lol", i);
       Domain.Builder builder =
-          makeDomain(domainName, null, null, null, null, null, registrar)
+          makeDomain(domainName, null, null, registrar)
               .asBuilder()
               .setNameservers(hostKeys)
               .setCreationTimeForTest(clock.nowUtc().minusYears(3))

core/src/test/java/google/registry/rdap/RdapEntityActionTest.java

@@ -54,7 +54,7 @@ class RdapEntityActionTest extends RdapActionBaseTestCase<RdapEntityAction> {
     persistResources(makeRegistrarPocs(registrarLol));
     Host host1 = persistResource(makeHost("ns1.cat.lol", "1.2.3.4"));
     Host host2 = persistResource(makeHost("ns2.cat.lol", "bad:f00d:cafe:0:0:0:15:beef"));
-    persistResource(makeDomain("cat.lol", null, null, null, host1, host2, registrarLol));
+    persistResource(makeDomain("cat.lol", host1, host2, registrarLol));
     // xn--q9jyb4c
     createTld("xn--q9jyb4c");
     Registrar registrarIdn = persistResource(

core/src/test/java/google/registry/rdap/RdapJsonFormatterTest.java

@@ -114,9 +114,7 @@ class RdapJsonFormatterTest {
             "ns5.cat.みんな", null, null, clock.nowUtc().minusYears(5), "unicoderegistrar");
     // Create an unused domain that references hostBoth and hostNoAddresses so that
     // they will have "associated" (ie, StatusValue.LINKED) status.
-    Domain dog =
-        persistResource(
-            makeDomain("dog.みんな", null, null, null, hostBoth, hostNoAddresses, registrar));
+    Domain dog = persistResource(makeDomain("dog.みんな", hostBoth, hostNoAddresses, registrar));
     hostSuperordinatePendingTransfer =
         persistResource(
             makeAndPersistHost(
@@ -142,14 +140,14 @@ class RdapJsonFormatterTest {
                 .build());
     domainFull =
         persistResource(
-            makeDomain("cat.みんな", null, null, null, hostIpv4, hostIpv6, registrar)
+            makeDomain("cat.みんな", hostIpv4, hostIpv6, registrar)
                 .asBuilder()
                 .setCreationTimeForTest(clock.nowUtc().minusMonths(4))
                 .setLastEppUpdateTime(clock.nowUtc().minusMonths(3))
                 .build());
     domainNoNameserversNoTransfers =
         persistResource(
-            makeDomain("fish.みんな", null, null, null, null, null, registrar)
+            makeDomain("fish.みんな", null, null, registrar)
                 .asBuilder()
                 .setCreationTimeForTest(clock.nowUtc())
                 .setLastEppUpdateTime(null)

core/src/test/java/google/registry/rdap/RdapNameserverSearchActionTest.java

@@ -131,7 +131,7 @@ class RdapNameserverSearchActionTest extends RdapSearchActionTestCase<RdapNamese
     // create a domain so that we can use it as a test nameserver search string suffix
     domainCatLol =
         persistResource(
-            makeDomain("cat.lol", null, null, null, hostNs1CatLol, hostNs2CatLol, registrar)
+            makeDomain("cat.lol", hostNs1CatLol, hostNs2CatLol, registrar)
                 .asBuilder()
                 .setSubordinateHosts(ImmutableSet.of("ns1.cat.lol", "ns2.cat.lol"))
                 .build());

core/src/test/java/google/registry/rde/RdeFixtures.java

@@ -15,8 +15,8 @@
 package google.registry.rde;
 
 import static com.google.common.io.BaseEncoding.base16;
-import static google.registry.testing.DatabaseHelper.generateNewContactHostRoid;
 import static google.registry.testing.DatabaseHelper.generateNewDomainRoid;
+import static google.registry.testing.DatabaseHelper.generateNewHostRoid;
 import static google.registry.testing.DatabaseHelper.persistResource;
 import static google.registry.util.DateTimeUtils.END_OF_TIME;
 import static org.joda.money.CurrencyUnit.USD;
@@ -226,7 +226,7 @@ final class RdeFixtures {
     return persistResource(
         new Contact.Builder()
             .setContactId(id)
-            .setRepoId(generateNewContactHostRoid())
+            .setRepoId(generateNewHostRoid())
             .setEmailAddress(email)
             .setStatusValues(ImmutableSet.of(StatusValue.OK))
             .setPersistedCurrentSponsorRegistrarId("GetTheeBack")
@@ -256,7 +256,7 @@ final class RdeFixtures {
     clock.advanceOneMilli();
     return persistResource(
         new Host.Builder()
-            .setRepoId(generateNewContactHostRoid())
+            .setRepoId(generateNewHostRoid())
             .setCreationRegistrarId("LawyerCat")
             .setCreationTimeForTest(clock.nowUtc())
             .setPersistedCurrentSponsorRegistrarId("BusinessCat")

core/src/test/java/google/registry/server/Fixture.java

@@ -14,28 +14,19 @@
 
 package google.registry.server;
 
-import static google.registry.model.domain.DesignatedContact.Type.ADMIN;
-import static google.registry.model.domain.DesignatedContact.Type.BILLING;
-import static google.registry.model.domain.DesignatedContact.Type.TECH;
 import static google.registry.testing.DatabaseHelper.createTlds;
 import static google.registry.testing.DatabaseHelper.loadRegistrar;
-import static google.registry.testing.DatabaseHelper.newContact;
 import static google.registry.testing.DatabaseHelper.persistActiveHost;
 import static google.registry.testing.DatabaseHelper.persistPremiumList;
 import static google.registry.testing.DatabaseHelper.persistResource;
 import static org.joda.money.CurrencyUnit.USD;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import google.registry.model.OteStatsTestHelper;
 import google.registry.model.console.RegistrarRole;
 import google.registry.model.console.User;
 import google.registry.model.console.UserRoles;
-import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactAddress;
-import google.registry.model.contact.PostalInfo;
-import google.registry.model.domain.DesignatedContact;
 import google.registry.testing.DatabaseHelper;
 import java.io.IOException;
 
@@ -63,78 +54,9 @@ public enum Fixture {
         throw new RuntimeException(e);
       }
 
-      Contact google =
-          persistResource(
-              newContact("google")
-                  .asBuilder()
-                  .setLocalizedPostalInfo(
-                      new PostalInfo.Builder()
-                          .setType(PostalInfo.Type.LOCALIZED)
-                          .setName("Mr. Google")
-                          .setOrg("Google Inc.")
-                          .setAddress(
-                              new ContactAddress.Builder()
-                                  .setStreet(ImmutableList.of("111 8th Ave", "4th Floor"))
-                                  .setCity("New York")
-                                  .setState("NY")
-                                  .setZip("10011")
-                                  .setCountryCode("US")
-                                  .build())
-                          .build())
-                  .build());
-
-      Contact justine =
-          persistResource(
-              newContact("justine")
-                  .asBuilder()
-                  .setLocalizedPostalInfo(
-                      new PostalInfo.Builder()
-                          .setType(PostalInfo.Type.LOCALIZED)
-                          .setName("Justine Bean")
-                          .setOrg("(✿◕ ‿◕ )ノ Incorporated")
-                          .setAddress(
-                              new ContactAddress.Builder()
-                                  .setStreet(ImmutableList.of("123 Fake St."))
-                                  .setCity("Stratford")
-                                  .setState("CT")
-                                  .setZip("06615")
-                                  .setCountryCode("US")
-                                  .build())
-                          .build())
-                  .build());
-
-      Contact robert =
-          persistResource(
-              newContact("robert")
-                  .asBuilder()
-                  .setLocalizedPostalInfo(
-                      new PostalInfo.Builder()
-                          .setType(PostalInfo.Type.LOCALIZED)
-                          .setName("Captain Robert")
-                          .setOrg("Ancient World")
-                          .setAddress(
-                              new ContactAddress.Builder()
-                                  .setStreet(
-                                      ImmutableList.of(
-                                          "A skeleton crew is what came back",
-                                          "And once in port he filled his sack",
-                                          "With bribes and cash and fame and coin"))
-                                  .setCity("Things to make a new crew join")
-                                  .setState("NY")
-                                  .setZip("10011")
-                                  .setCountryCode("US")
-                                  .build())
-                          .build())
-                  .build());
-
       persistResource(
-          DatabaseHelper.newDomain("love.xn--q9jyb4c", justine)
+          DatabaseHelper.newDomain("love.xn--q9jyb4c")
               .asBuilder()
-              .setContacts(
-                  ImmutableSet.of(
-                      DesignatedContact.create(ADMIN, robert.createVKey()),
-                      DesignatedContact.create(BILLING, google.createVKey()),
-                      DesignatedContact.create(TECH, justine.createVKey())))
               .setNameservers(
                   ImmutableSet.of(
                       persistActiveHost("ns1.love.xn--q9jyb4c").createVKey(),
@@ -142,13 +64,8 @@ public enum Fixture {
               .build());
 
       persistResource(
-          DatabaseHelper.newDomain("moogle.example", justine)
+          DatabaseHelper.newDomain("moogle.example")
               .asBuilder()
-              .setContacts(
-                  ImmutableSet.of(
-                      DesignatedContact.create(ADMIN, robert.createVKey()),
-                      DesignatedContact.create(BILLING, google.createVKey()),
-                      DesignatedContact.create(TECH, justine.createVKey())))
               .setNameservers(
                   ImmutableSet.of(
                       persistActiveHost("ns1.linode.com").createVKey(),

core/src/test/java/google/registry/testing/DatabaseHelper.java

@@ -24,7 +24,7 @@ import static com.google.common.collect.Iterables.toArray;
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static google.registry.config.RegistryConfig.getContactAndHostRoidSuffix;
+import static google.registry.config.RegistryConfig.getHostRoidSuffix;
 import static google.registry.model.EppResourceUtils.createDomainRepoId;
 import static google.registry.model.EppResourceUtils.createRepoId;
 import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableObjects;
@@ -150,7 +150,7 @@ public final class DatabaseHelper {
   }
 
   public static Host newHost(String hostName) {
-    return newHostWithRoid(hostName, generateNewContactHostRoid());
+    return newHostWithRoid(hostName, generateNewHostRoid());
   }
 
   public static Host newHostWithRoid(String hostName, String repoId) {
@@ -201,7 +201,7 @@ public final class DatabaseHelper {
    * an auto-generated repoId.
    */
   public static Contact newContact(String contactId) {
-    return newContactWithRoid(contactId, generateNewContactHostRoid());
+    return newContactWithRoid(contactId, generateNewHostRoid());
   }
 
   public static Contact newContactWithRoid(String contactId, String repoId) {
@@ -924,8 +924,8 @@ public final class DatabaseHelper {
   }
 
   /** Returns a newly allocated, globally unique contact/host repoId of the format HEX_TLD-ROID. */
-  public static String generateNewContactHostRoid() {
-    return createRepoId(tm().reTransact(tm()::allocateId), getContactAndHostRoidSuffix());
+  public static String generateNewHostRoid() {
+    return createRepoId(tm().reTransact(tm()::allocateId), getHostRoidSuffix());
   }
 
   /** Persists an object in the DB for tests. */

core/src/test/java/google/registry/testing/FullFieldsTestEntityHelper.java

@@ -14,8 +14,8 @@
 
 package google.registry.testing;
 
-import static google.registry.testing.DatabaseHelper.generateNewContactHostRoid;
 import static google.registry.testing.DatabaseHelper.generateNewDomainRoid;
+import static google.registry.testing.DatabaseHelper.generateNewHostRoid;
 import static google.registry.testing.DatabaseHelper.persistResource;
 import static google.registry.util.DomainNameUtils.getTldFromDomainName;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -24,11 +24,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.InetAddresses;
 import google.registry.model.EppResource;
-import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactAddress;
-import google.registry.model.contact.ContactPhoneNumber;
-import google.registry.model.contact.PostalInfo;
-import google.registry.model.domain.DesignatedContact;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.Period;
@@ -43,8 +38,6 @@ import google.registry.model.reporting.HistoryEntry;
 import google.registry.persistence.VKey;
 import google.registry.util.Idn;
 import java.net.InetAddress;
-import java.util.List;
-import java.util.Optional;
 import javax.annotation.Nullable;
 import org.joda.time.DateTime;
 
@@ -142,7 +135,7 @@ public final class FullFieldsTestEntityHelper {
       String fqhn, @Nullable String ip1, @Nullable String ip2, String registrarClientId) {
     Host.Builder builder =
         new Host.Builder()
-            .setRepoId(generateNewContactHostRoid())
+            .setRepoId(generateNewHostRoid())
             .setHostName(fqhn)
             .setCreationTimeForTest(DateTime.parse("2000-10-08T00:45:00Z"))
             .setPersistedCurrentSponsorRegistrarId(registrarClientId);
@@ -183,156 +176,8 @@ public final class FullFieldsTestEntityHelper {
     return host;
   }
 
-  public static Contact makeContact(String id, String name, @Nullable String email) {
-    return makeContact(id, name, email, ImmutableList.of("123 Example Boulevard <script>"), null);
-  }
-
-  public static Contact makeContact(
-      String id, String name, @Nullable String email, @Nullable Registrar registrar) {
-    return makeContact(
-        id, name, email, ImmutableList.of("123 Example Boulevard <script>"), registrar);
-  }
-
-  public static Contact makeContact(
-      String id,
-      String name,
-      @Nullable String email,
-      @Nullable List<String> street,
-      @Nullable Registrar registrar) {
-    return makeContact(id, name, email, street, registrar, null);
-  }
-
-  public static Contact makeContact(
-      String id,
-      String name,
-      @Nullable String email,
-      @Nullable List<String> street,
-      @Nullable Registrar registrar,
-      @Nullable DateTime deletionTime) {
-    PostalInfo.Builder postalBuilder = new PostalInfo.Builder()
-        .setType(PostalInfo.Type.INTERNATIONALIZED)
-        .setName(name)
-        .setOrg("GOOGLE INCORPORATED <script>");
-    if (street != null) {
-        postalBuilder.setAddress(new ContactAddress.Builder()
-            .setStreet(ImmutableList.copyOf(street))
-            .setCity("KOKOMO")
-            .setState("BM")
-            .setZip("31337")
-            .setCountryCode("US")
-            .build());
-    }
-    Contact.Builder builder =
-        new Contact.Builder()
-            .setContactId(id)
-            .setRepoId(generateNewContactHostRoid())
-            .setCreationTimeForTest(DateTime.parse("2000-10-08T00:45:00Z"))
-            .setInternationalizedPostalInfo(postalBuilder.build())
-            .setVoiceNumber(
-                new ContactPhoneNumber.Builder().setPhoneNumber("+1.2126660420").build())
-            .setFaxNumber(new ContactPhoneNumber.Builder().setPhoneNumber("+1.2126660420").build());
-    if (email != null) {
-      builder.setEmailAddress(email);
-    }
-    String registrarId = registrar == null ? "TheRegistrar" : registrar.getRegistrarId();
-    builder.setCreationRegistrarId(registrarId).setPersistedCurrentSponsorRegistrarId(registrarId);
-    if (deletionTime != null) {
-      builder.setDeletionTime(deletionTime);
-    }
-    return builder.build();
-  }
-
-  public static Contact makeWipedOutContact(
-      String id, @Nullable Registrar registrar, @Nullable DateTime deletionTime) {
-    Contact.Builder builder =
-        new Contact.Builder()
-            .setContactId(id)
-            .setRepoId(generateNewContactHostRoid())
-            .setCreationTimeForTest(DateTime.parse("2000-10-08T00:45:00Z"));
-    if (registrar != null) {
-      builder
-          .setCreationRegistrarId(registrar.getRegistrarId())
-          .setPersistedCurrentSponsorRegistrarId(registrar.getRegistrarId());
-    }
-    if (deletionTime != null) {
-      builder.setDeletionTime(deletionTime);
-    }
-    return builder.build();
-  }
-
-  public static Contact makeAndPersistContact(
-      String id,
-      String name,
-      @Nullable String email,
-      @Nullable DateTime creationTime,
-      @Nullable Registrar registrar) {
-    return makeAndPersistContact(
-        id,
-        name,
-        email,
-        ImmutableList.of("123 Example Boulevard <script>"),
-        creationTime,
-        registrar,
-        null);
-  }
-
-  public static Contact makeAndPersistContact(
-      String id,
-      String name,
-      @Nullable String email,
-      @Nullable List<String> street,
-      @Nullable DateTime creationTime) {
-    return makeAndPersistContact(id, name, email, street, creationTime, null, null);
-  }
-
-  public static Contact makeAndPersistContact(
-      String id,
-      String name,
-      @Nullable String email,
-      @Nullable List<String> street,
-      @Nullable DateTime creationTime,
-      @Nullable Registrar registrar) {
-    return makeAndPersistContact(id, name, email, street, creationTime, registrar, null);
-  }
-
-  public static Contact makeAndPersistContact(
-      String id,
-      String name,
-      @Nullable String email,
-      @Nullable List<String> street,
-      @Nullable DateTime creationTime,
-      @Nullable Registrar registrar,
-      @Nullable DateTime deletionTime) {
-    Contact contact =
-        persistResource(makeContact(id, name, email, street, registrar, deletionTime));
-    if (creationTime != null) {
-      persistResource(
-          makeHistoryEntry(
-              contact, HistoryEntry.Type.CONTACT_CREATE, null, "created", creationTime));
-    }
-    if (deletionTime != null) {
-      persistResource(
-          makeHistoryEntry(
-              contact, HistoryEntry.Type.CONTACT_DELETE, null, "deleted", deletionTime));
-    }
-    return contact;
-  }
-
-  public static Contact makeAndPersistDeletedContact(
-      String id, DateTime creationTime, Registrar registrar, DateTime deletionTime) {
-    Contact contact = persistResource(makeWipedOutContact(id, registrar, deletionTime));
-    persistResource(
-        makeHistoryEntry(contact, HistoryEntry.Type.CONTACT_CREATE, null, "created", creationTime));
-    persistResource(
-        makeHistoryEntry(contact, HistoryEntry.Type.CONTACT_DELETE, null, "deleted", deletionTime));
-    return contact;
-  }
-
   public static Domain makeDomain(
       String domain,
-      @Nullable Contact registrant,
-      @Nullable Contact admin,
-      @Nullable Contact tech,
       @Nullable Host ns1,
       @Nullable Host ns2,
       Registrar registrar) {
@@ -352,21 +197,6 @@ public final class FullFieldsTestEntityHelper {
                     StatusValue.CLIENT_TRANSFER_PROHIBITED,
                     StatusValue.SERVER_UPDATE_PROHIBITED))
             .setDsData(ImmutableSet.of(DomainDsData.create(1, 2, 3, "deadface")));
-    if (registrant != null) {
-      builder.setRegistrant(Optional.of(registrant.createVKey()));
-    }
-    if ((admin != null) || (tech != null)) {
-      ImmutableSet.Builder<DesignatedContact> contactsBuilder = new ImmutableSet.Builder<>();
-      if (admin != null) {
-        contactsBuilder.add(
-            DesignatedContact.create(DesignatedContact.Type.ADMIN, admin.createVKey()));
-      }
-      if (tech != null) {
-        contactsBuilder.add(
-            DesignatedContact.create(DesignatedContact.Type.TECH, tech.createVKey()));
-      }
-      builder.setContacts(contactsBuilder.build());
-    }
     if ((ns1 != null) || (ns2 != null)) {
       ImmutableSet.Builder<VKey<Host>> nsBuilder = new ImmutableSet.Builder<>();
       if (ns1 != null) {

core/src/test/java/google/registry/tools/CreateDomainCommandTest.java

@@ -47,9 +47,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
         "--client=NewRegistrar",
         "--period=1",
         "--nameservers=ns1.zdns.google,ns2.zdns.google,ns3.zdns.google,ns4.zdns.google",
-        "--registrant=crr-admin",
-        "--admins=crr-admin",
-        "--techs=crr-tech",
         "--password=2fooBAR",
         "--ds_records=1 2 2 9F86D081884C7D659A2FEAA0C55AD015A3BF4F1B2B0B822CD15D6C15B0F00A08,4 5 1"
             + " A94A8FE5CCB19BA61C4C0873D391E987982FBBD3",
@@ -64,9 +61,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
         "--client=NewRegistrar",
         "--period=1",
         "--nameservers=NS1.zdns.google,ns2.ZDNS.google,ns3.zdns.gOOglE,ns4.zdns.google",
-        "--registrant=crr-admin",
-        "--admins=crr-admin",
-        "--techs=crr-tech",
         "--password=2fooBAR",
         "--ds_records=1 2 2 9F86D081884C7D659A2FEAA0C55AD015A3BF4F1B2B0B822CD15D6C15B0F00A08,4 5 1"
             + " A94A8FE5CCB19BA61C4C0873D391E987982FBBD3",
@@ -81,9 +75,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
         "--client=NewRegistrar",
         "--period=1",
         "--nameservers=ns[1-4].zdns.google",
-        "--registrant=crr-admin",
-        "--admins=crr-admin",
-        "--techs=crr-tech",
         "--password=2fooBAR",
         "--ds_records=1 2 2 9F86D081884C7D659A2FEAA0C55AD015A3BF4F1B2B0B822CD15D6C15B0F00A08,4 5 1"
             + " A94A8FE5CCB19BA61C4C0873D391E987982FBBD3",
@@ -98,9 +89,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
         "--client=NewRegistrar",
         "--period=1",
         "--nameservers=NS[1-4].zdns.google",
-        "--registrant=crr-admin",
-        "--admins=crr-admin",
-        "--techs=crr-tech",
         "--password=2fooBAR",
         "--ds_records=1 2 2 9F86D081884C7D659A2FEAA0C55AD015A3BF4F1B2B0B822CD15D6C15B0F00A08,4 5 1"
             + " A94A8FE5CCB19BA61C4C0873D391E987982FBBD3",
@@ -123,14 +111,9 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
     createTld("abc");
     runCommandForced(
         "--client=NewRegistrar",
-        "--registrant=crr-admin",
-        "--admins=crr-admin",
-        "--techs=crr-tech",
         "example.tld",
         "example.abc");
-    eppVerifier
-        .verifySent("domain_create_contacts.xml")
-        .verifySent("domain_create_contacts_abc.xml");
+    eppVerifier.verifySent("domain_create_minimal.xml").verifySent("domain_create_minimal_abc.xml");
   }
 
   @Test
@@ -145,14 +128,9 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
     tm().transact(() -> tm().put(registry));
     runCommandForced(
         "--client=NewRegistrar",
-        "--registrant=crr-admin",
-        "--admins=crr-admin",
-        "--techs=crr-tech",
         "example.tld",
         "example.abc");
-    eppVerifier
-        .verifySent("domain_create_contacts.xml")
-        .verifySent("domain_create_contacts_abc.xml");
+    eppVerifier.verifySent("domain_create_minimal.xml").verifySent("domain_create_minimal_abc.xml");
   }
 
   @Test
@@ -166,9 +144,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             .build());
     runCommandForced(
         "--client=NewRegistrar",
-        "--registrant=crr-admin",
-        "--admins=crr-admin",
-        "--techs=crr-tech",
         "--period=3",
         "--force_premiums",
         "parajiumu.baar");
@@ -183,17 +158,14 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
     createTld("abc");
     runCommandForced(
         "--client=NewRegistrar",
-        "--registrant=crr-admin",
-        "--admins=crr-admin",
-        "--techs=crr-tech",
         "--force_premiums",
         "example.tld",
         "palladium.tld",
         "example.abc");
     eppVerifier
-        .verifySent("domain_create_contacts.xml")
+        .verifySent("domain_create_minimal.xml")
         .verifySent("domain_create_palladium.xml")
-        .verifySent("domain_create_contacts_abc.xml");
+        .verifySent("domain_create_minimal_abc.xml");
     assertInStdout(
         "palladium.tld is premium at USD 877.00 per year; "
             + "sending total cost for 1 year(s) of USD 877.00.");
@@ -204,9 +176,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
     createTld("tld");
     runCommandForced(
         "--client=NewRegistrar",
-        "--registrant=crr-admin",
-        "--admins=crr-admin",
-        "--techs=crr-tech",
         "--reason=Creating test domain",
         "--registrar_request=false",
         "example.tld");
@@ -218,27 +187,11 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
     createTld("tld");
     runCommandForced(
         "--client=NewRegistrar",
-        "--registrant=crr-admin",
-        "--admins=crr-admin",
-        "--techs=crr-tech",
         "--allocation_token=abc123",
         "example.tld");
     eppVerifier.verifySent("domain_create_token.xml");
   }
 
-  @Test
-  void testSuccess_contactsStillRequired() throws Exception {
-    // Verify that if contacts are still required, the minimum+contacts request is sent
-    createTld("tld");
-    runCommandForced(
-        "--client=NewRegistrar",
-        "--registrant=crr-admin",
-        "--admins=crr-admin",
-        "--techs=crr-tech",
-        "example.tld");
-    eppVerifier.verifySent("domain_create_contacts.xml");
-  }
-
   @Test
   void testFailure_duplicateDomains() {
     IllegalArgumentException thrown =
@@ -247,9 +200,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "example.tld",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().contains("Duplicate arguments found: 'example.tld'");
@@ -258,14 +208,7 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
   @Test
   void testFailure_missingDomain() {
     ParameterException thrown =
-        assertThrows(
-            ParameterException.class,
-            () ->
-                runCommandForced(
-                    "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech"));
+        assertThrows(ParameterException.class, () -> runCommandForced("--client=NewRegistrar"));
     assertThat(thrown).hasMessageThat().contains("Main parameters are required");
   }
 
@@ -276,9 +219,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             ParameterException.class,
             () ->
                 runCommandForced(
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
-                    "--registrant=crr-admin",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().contains("--client");
   }
@@ -291,9 +231,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--nameservers=ns1.zdns.google,ns2.zdns.google,ns3.zdns.google,ns4.zdns.google,"
                         + "ns5.zdns.google,ns6.zdns.google,ns7.zdns.google,ns8.zdns.google,"
                         + "ns9.zdns.google,ns10.zdns.google,ns11.zdns.google,ns12.zdns.google,"
@@ -310,9 +247,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--nameservers=ns[1-14].zdns.google",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().contains("There can be at most 13 nameservers");
@@ -326,9 +260,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--period=x",
                     "--domain=example.tld"));
     assertThat(thrown).hasMessageThat().contains("--period");
@@ -342,9 +273,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--ds_records=1 2 3 abcd",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().isEqualTo("DS record uses an unrecognized digest type: 3");
@@ -358,9 +286,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--ds_records=1 2 1 abcd",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().isEqualTo("DS record has an invalid digest length: ABCD");
@@ -374,9 +299,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--ds_records=1 999 4"
                         + " 768412320F7B0AA5812FCE428DC4706B3CAE50E02A64CAA16A782249BFE8EFC4B7EF1C"
                         + "CB126255D196047DFEDF17A0A9",
@@ -392,9 +314,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--ds_records=1 2 3 ab cd",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().contains("should have 4 parts, but has 5");
@@ -408,9 +327,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--ds_records=x 2 3 abcd",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().contains("\"x\"");
@@ -424,9 +340,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--ds_records=1 x 3 abcd",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().contains("\"x\"");
@@ -440,9 +353,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--ds_records=1 2 x abcd",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().contains("\"x\"");
@@ -456,9 +366,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--ds_records=1 2 3 xbcd",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().contains("XBCD");
@@ -472,9 +379,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--ds_records=1 2 3 abcde",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().contains("length 5");
@@ -488,9 +392,6 @@ class CreateDomainCommandTest extends EppToolCommandTestCase<CreateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "gold.tld"));
     assertThat(thrown)
         .hasMessageThat()

core/src/test/java/google/registry/tools/UpdateDomainCommandTest.java

@@ -20,7 +20,6 @@ import static google.registry.model.eppcommon.StatusValue.PENDING_DELETE;
 import static google.registry.model.eppcommon.StatusValue.SERVER_UPDATE_PROHIBITED;
 import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_CREATE;
 import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.newContact;
 import static google.registry.testing.DatabaseHelper.persistActiveDomain;
 import static google.registry.testing.DatabaseHelper.persistActiveHost;
 import static google.registry.testing.DatabaseHelper.persistResource;
@@ -35,8 +34,6 @@ import com.google.common.collect.ImmutableSet;
 import google.registry.model.billing.BillingBase.Flag;
 import google.registry.model.billing.BillingBase.Reason;
 import google.registry.model.billing.BillingRecurrence;
-import google.registry.model.contact.Contact;
-import google.registry.model.domain.DesignatedContact;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.GracePeriod;
@@ -75,18 +72,13 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
     runCommandForced(
         "--client=NewRegistrar",
         "--add_nameservers=ns1.zdns.google,ns2.zdns.google",
-        "--add_admins=crr-admin2",
-        "--add_techs=crr-tech2",
         "--add_statuses=serverDeleteProhibited",
         "--add_ds_records=1 2 2 9F86D081884C7D659A2FEAA0C55AD015A3BF4F1B2B0B822CD15D6C15B0F00A08,4"
             + " 5 1 A94A8FE5CCB19BA61C4C0873D391E987982FBBD3",
         "--remove_nameservers=ns3.zdns.google,ns4.zdns.google",
-        "--remove_admins=crr-admin1",
-        "--remove_techs=crr-tech1",
         "--remove_statuses=serverHold",
         "--remove_ds_records=7 8 1 A94A8FE5CCB19BA61C4C0873D391E987982FBBD3,6 5 4"
             + " 768412320F7B0AA5812FCE428DC4706B3CAE50E02A64CAA16A782249BFE8EFC4B7EF1CCB126255D196047DFEDF17A0A9",
-        "--registrant=crr-admin",
         "--password=2fooBAR",
         "example.tld");
     eppVerifier.verifySent("domain_update_complete.xml");
@@ -97,18 +89,13 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
     runCommandForced(
         "--client=NewRegistrar",
         "--add_nameservers=NS[1-2].zdns.google",
-        "--add_admins=crr-admin2",
-        "--add_techs=crr-tech2",
         "--add_statuses=serverDeleteProhibited",
         "--add_ds_records=1 2 2 9F86D081884C7D659A2FEAA0C55AD015A3BF4F1B2B0B822CD15D6C15B0F00A08,4"
             + " 5 1 A94A8FE5CCB19BA61C4C0873D391E987982FBBD3",
         "--remove_nameservers=ns[3-4].zdns.google",
-        "--remove_admins=crr-admin1",
-        "--remove_techs=crr-tech1",
         "--remove_statuses=serverHold",
         "--remove_ds_records=7 8 1 A94A8FE5CCB19BA61C4C0873D391E987982FBBD3,6 5 4"
             + " 768412320F7B0AA5812FCE428DC4706B3CAE50E02A64CAA16A782249BFE8EFC4B7EF1CCB126255D196047DFEDF17A0A9",
-        "--registrant=crr-admin",
         "--password=2fooBAR",
         "example.tld");
     eppVerifier.verifySent("domain_update_complete.xml");
@@ -121,18 +108,13 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
     runCommandForced(
         "--client=NewRegistrar",
         "--add_nameservers=ns1.zdns.google,ns2.zdns.google",
-        "--add_admins=crr-admin2",
-        "--add_techs=crr-tech2",
         "--add_statuses=serverDeleteProhibited",
         "--add_ds_records=1 2 2 9F86D081884C7D659A2FEAA0C55AD015A3BF4F1B2B0B822CD15D6C15B0F00A08,4"
             + " 5 1 A94A8FE5CCB19BA61C4C0873D391E987982FBBD3",
         "--remove_nameservers=ns[3-4].zdns.google",
-        "--remove_admins=crr-admin1",
-        "--remove_techs=crr-tech1",
         "--remove_statuses=serverHold",
         "--remove_ds_records=7 8 1 A94A8FE5CCB19BA61C4C0873D391E987982FBBD3,6 5 4"
             + " 768412320F7B0AA5812FCE428DC4706B3CAE50E02A64CAA16A782249BFE8EFC4B7EF1CCB126255D196047DFEDF17A0A9",
-        "--registrant=crr-admin",
         "--password=2fooBAR",
         "example.tld",
         "example.abc");
@@ -177,8 +159,6 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
     runCommandForced(
         "--client=NewRegistrar",
         "--add_nameservers=ns2.zdns.google,ns3.zdns.google",
-        "--add_admins=crr-admin2",
-        "--add_techs=crr-tech2",
         "--add_statuses=serverDeleteProhibited",
         "--add_ds_records=1 2 2 D4B7D520E7BB5F0F67674A0CCEB1E3E0614B93C4F9E99B8383F6A1E4469DA50A,4"
             + " 5 1 A94A8FE5CCB19BA61C4C0873D391E987982FBBD3",
@@ -191,8 +171,6 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
     runCommandForced(
         "--client=NewRegistrar",
         "--remove_nameservers=ns4.zdns.google",
-        "--remove_admins=crr-admin1",
-        "--remove_techs=crr-tech1",
         "--remove_statuses=serverHold",
         "--remove_ds_records=7 8 1 A94A8FE5CCB19BA61C4C0873D391E987982FBBD3,6 5 4"
             + " 768412320F7B0AA5812FCE428DC4706B3CAE50E02A64CAA16A782249BFE8EFC4B7EF1CCB126255D196047DFEDF17A0A9",
@@ -202,8 +180,7 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
 
   @Test
   void testSuccess_change() throws Exception {
-    runCommandForced(
-        "--client=NewRegistrar", "--registrant=crr-admin", "--password=2fooBAR", "example.tld");
+    runCommandForced("--client=NewRegistrar", "--password=2fooBAR", "example.tld");
     eppVerifier.verifySent("domain_update_change.xml");
   }
 
@@ -211,7 +188,6 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
   void testSuccess_change_reasonAndRegistrarRequest() throws Exception {
     runCommandForced(
         "--client=NewRegistrar",
-        "--registrant=crr-admin",
         "--password=2fooBAR",
         "--reason=Testing domain update",
         "--registrar_request=false",
@@ -230,27 +206,6 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
     eppVerifier.verifySent("domain_update_set_nameservers.xml");
   }
 
-  @Test
-  void testSuccess_setContacts() throws Exception {
-    Contact adminContact = persistResource(newContact("crr-admin1"));
-    Contact techContact = persistResource(newContact("crr-tech1"));
-    VKey<Contact> adminContactKey = adminContact.createVKey();
-    VKey<Contact> techContactKey = techContact.createVKey();
-
-    persistResource(
-        domain
-            .asBuilder()
-            .setContacts(
-                ImmutableSet.of(
-                    DesignatedContact.create(DesignatedContact.Type.ADMIN, adminContactKey),
-                    DesignatedContact.create(DesignatedContact.Type.TECH, techContactKey)))
-            .build());
-
-    runCommandForced(
-        "--client=NewRegistrar", "--admins=crr-admin3", "--techs=crr-tech3", "example.tld");
-    eppVerifier.verifySent("domain_update_set_contacts.xml");
-  }
-
   @Test
   void testSuccess_setStatuses() throws Exception {
     Host host = persistActiveHost("ns1.zdns.google");
@@ -359,29 +314,23 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
 
   @Test
   void testSuccess_canUpdatePendingDeleteDomain_whenSuperuserPassesOverrideFlag() throws Exception {
-    Contact adminContact = persistResource(newContact("crr-admin1"));
-    Contact techContact = persistResource(newContact("crr-tech1"));
-    VKey<Contact> adminContactKey = adminContact.createVKey();
-    VKey<Contact> techContactKey = techContact.createVKey();
+    Host host1 = persistActiveHost("ns1.zdns.google");
+    persistActiveHost("ns2.zdns.google");
 
     persistResource(
         domain
             .asBuilder()
-            .setContacts(
-                ImmutableSet.of(
-                    DesignatedContact.create(DesignatedContact.Type.ADMIN, adminContactKey),
-                    DesignatedContact.create(DesignatedContact.Type.TECH, techContactKey)))
+            .setNameservers(host1.createVKey())
             .setStatusValues(ImmutableSet.of(PENDING_DELETE))
             .build());
 
     runCommandForced(
         "--client=NewRegistrar",
-        "--admins=crr-admin3",
-        "--techs=crr-tech3",
+        "--add_nameservers=ns2.zdns.google",
         "--superuser",
         "--force_in_pending_delete",
         "example.tld");
-    eppVerifier.expectSuperuser().verifySent("domain_update_set_contacts.xml");
+    eppVerifier.expectSuperuser().verifySent("domain_update_add_nameserver.xml");
   }
 
   @Test
@@ -440,7 +389,6 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
                     "--password=2fooBAR",
                     "example.tld",
                     "example.tld"));
@@ -452,9 +400,7 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
     ParameterException thrown =
         assertThrows(
             ParameterException.class,
-            () ->
-                runCommandForced(
-                    "--client=NewRegistrar", "--registrant=crr-admin", "--password=2fooBAR"));
+            () -> runCommandForced("--client=NewRegistrar", "--password=2fooBAR"));
     assertThat(thrown).hasMessageThat().contains("Main parameters are required");
   }
 
@@ -462,8 +408,7 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
   void testFailure_missingClientId() {
     ParameterException thrown =
         assertThrows(
-            ParameterException.class,
-            () -> runCommandForced("--registrant=crr-admin", "--password=2fooBAR", "example.tld"));
+            ParameterException.class, () -> runCommandForced("--password=2fooBAR", "example.tld"));
     assertThat(thrown).hasMessageThat().contains("--client");
   }
 
@@ -479,8 +424,6 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
                         + "ns5.zdns.google,ns6.zdns.google,ns7.zdns.google,ns8.zdns.google,"
                         + "ns9.zdns.google,ns10.zdns.google,ns11.zdns.google,ns12.zdns.google,"
                         + "ns13.zdns.google,ns14.zdns.google",
-                    "--add_admins=crr-admin2",
-                    "--add_techs=crr-tech2",
                     "--add_statuses=serverDeleteProhibited",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().contains("You can add at most 13 nameservers");
@@ -522,76 +465,6 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
                 + "you cannot use the add_nameservers and remove_nameservers flags.");
   }
 
-  @Test
-  void testFailure_providedAdminsAndAddAdmins() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--client=NewRegistrar",
-                    "--add_admins=crr-admin2",
-                    "--admins=crr-admin2",
-                    "example.tld"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .isEqualTo(
-            "If you provide the admins flag, "
-                + "you cannot use the add_admins and remove_admins flags.");
-  }
-
-  @Test
-  void testFailure_providedAdminsAndRemoveAdmins() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--client=NewRegistrar",
-                    "--remove_admins=crr-admin2",
-                    "--admins=crr-admin2",
-                    "example.tld"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .isEqualTo(
-            "If you provide the admins flag, "
-                + "you cannot use the add_admins and remove_admins flags.");
-  }
-
-  @Test
-  void testFailure_providedTechsAndAddTechs() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--client=NewRegistrar",
-                    "--add_techs=crr-tech2",
-                    "--techs=crr-tech2",
-                    "example.tld"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains(
-            "If you provide the techs flag, you cannot use the add_techs and remove_techs flags.");
-  }
-
-  @Test
-  void testFailure_providedTechsAndRemoveTechs() {
-    IllegalArgumentException thrown =
-        assertThrows(
-            IllegalArgumentException.class,
-            () ->
-                runCommandForced(
-                    "--client=NewRegistrar",
-                    "--remove_techs=crr-tech2",
-                    "--techs=crr-tech2",
-                    "example.tld"));
-    assertThat(thrown)
-        .hasMessageThat()
-        .contains(
-            "If you provide the techs flag, you cannot use the add_techs and remove_techs flags.");
-  }
-
   @Test
   void testFailure_providedStatusesAndAddStatuses() {
     IllegalArgumentException thrown =
@@ -664,9 +537,6 @@ class UpdateDomainCommandTest extends EppToolCommandTestCase<UpdateDomainCommand
             () ->
                 runCommandForced(
                     "--client=NewRegistrar",
-                    "--registrant=crr-admin",
-                    "--admins=crr-admin",
-                    "--techs=crr-tech",
                     "--ds_records=1 2 1 abcd",
                     "example.tld"));
     assertThat(thrown).hasMessageThat().isEqualTo("DS record has an invalid digest length: ABCD");

core/src/test/java/google/registry/tools/UpdateRegistrarCommandTest.java

@@ -968,6 +968,14 @@ class UpdateRegistrarCommandTest extends CommandTestCase<UpdateRegistrarCommand>
         () -> runCommand("--name tHeRe GiStRaR", "--force", "NewRegistrar"));
   }
 
+  @Test
+  void testSuccess_updateSameRegistrar_registrarNameSimilarToExisting() throws Exception {
+    // Note that "The -- registrar" normalizes identically to "The Registrar", which is created by
+    // JpaTransactionManagerExtension.
+    runCommand("--name The -- registrar", "--force", "TheRegistrar");
+    assertThat(loadRegistrar("TheRegistrar").getRegistrarName()).isEqualTo("The -- registrar");
+  }
+
   @Test
   void testSuccess_poNumberNotSpecified_doesntWipeOutExisting() throws Exception {
     Registrar registrar =

core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_stdv1.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xmlns:fee="urn:ietf:params:xml:ns:epp:fee-1.0" xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" xmlns:bulkToken="urn:google:params:xml:ns:bulkToken-1.0" xmlns:launch="urn:ietf:params:xml:ns:launch-1.0" xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" xmlns:host="urn:ietf:params:xml:ns:host-1.0">
+    <response>
+        <result code="1000">
+            <msg>Command completed successfully</msg>
+        </result>
+        <resData>
+            <domain:chkData>
+                <domain:cd>
+                    <domain:name avail="false">example.tld</domain:name>
+                    <domain:reason>Reserved; alloc. token required</domain:reason>
+                </domain:cd>
+            </domain:chkData>
+        </resData>
+        <extension>
+            <fee:chkData>
+                <fee:currency>USD</fee:currency>
+                <fee:cd>
+                    <fee:objID>example.tld</fee:objID>
+                    <fee:class>reserved</fee:class>
+                    <fee:command name="create">
+                        <fee:period unit="y">1</fee:period>
+                    </fee:command>
+                </fee:cd>
+                <fee:cd>
+                    <fee:objID>example.tld</fee:objID>
+                    <fee:class>premium</fee:class>
+                    <fee:command name="renew">
+                        <fee:period unit="y">1</fee:period>
+                        <fee:fee description="renew">499.00</fee:fee>
+                    </fee:command>
+                </fee:cd>
+                <fee:cd>
+                    <fee:objID>example.tld</fee:objID>
+                    <fee:class>premium</fee:class>
+                    <fee:command name="transfer">
+                        <fee:period unit="y">1</fee:period>
+                        <fee:fee description="renew">499.00</fee:fee>
+                    </fee:command>
+                </fee:cd>
+            </fee:chkData>
+        </extension>
+        <trID>
+            <clTRID>ff25dfc7-2025-469a-baec-bedde73e74de</clTRID>
+            <svTRID>k5VIs5JMR1SRbx3TY6pAxQ==-2c52e</svTRID>
+        </trID>
+    </response>
+</epp>

core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v06.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xmlns:fee="urn:ietf:params:xml:ns:fee-0.6" xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" xmlns:bulkToken="urn:google:params:xml:ns:bulkToken-1.0" xmlns:launch="urn:ietf:params:xml:ns:launch-1.0" xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" xmlns:host="urn:ietf:params:xml:ns:host-1.0">
+    <response>
+        <result code="1000">
+            <msg>Command completed successfully</msg>
+        </result>
+        <resData>
+            <domain:chkData>
+                <domain:cd>
+                    <domain:name avail="true">example.tld</domain:name>
+                </domain:cd>
+            </domain:chkData>
+        </resData>
+        <extension>
+            <fee:chkData>
+                <fee:cd>
+                    <fee:name>example.tld</fee:name>
+                    <fee:currency>USD</fee:currency>
+                    <fee:command>create</fee:command>
+                    <fee:period unit="y">1</fee:period>
+                    <fee:fee description="create">10.00</fee:fee>
+                </fee:cd>
+                <fee:cd>
+                    <fee:name>example.tld</fee:name>
+                    <fee:currency>USD</fee:currency>
+                    <fee:command>renew</fee:command>
+                    <fee:period unit="y">1</fee:period>
+                    <fee:fee description="renew">12.00</fee:fee>
+                </fee:cd>
+                <fee:cd>
+                    <fee:name>example.tld</fee:name>
+                    <fee:currency>USD</fee:currency>
+                    <fee:command>transfer</fee:command>
+                    <fee:period unit="y">1</fee:period>
+                    <fee:fee description="renew">12.00</fee:fee>
+                </fee:cd>
+                <fee:cd>
+                    <fee:name>example.tld</fee:name>
+                    <fee:currency>USD</fee:currency>
+                    <fee:command>restore</fee:command>
+                    <fee:period unit="y">1</fee:period>
+                    <fee:fee description="restore">50.00</fee:fee>
+                </fee:cd>
+            </fee:chkData>
+        </extension>
+        <trID>
+            <clTRID>trid</clTRID>
+            <svTRID>PAYQRVV3Q4eeq5B5FMvtmQ==-3406e2</svTRID>
+        </trID>
+    </response>
+</epp>

core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v11.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" xmlns:bulkToken="urn:google:params:xml:ns:bulkToken-1.0" xmlns:fee="urn:ietf:params:xml:ns:fee-0.11" xmlns:launch="urn:ietf:params:xml:ns:launch-1.0" xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" xmlns:host="urn:ietf:params:xml:ns:host-1.0">
+    <response>
+        <result code="1000">
+            <msg>Command completed successfully</msg>
+        </result>
+        <resData>
+            <domain:chkData>
+                <domain:cd>
+                    <domain:name avail="true">example.tld</domain:name>
+                </domain:cd>
+            </domain:chkData>
+        </resData>
+        <extension>
+            <fee:chkData>
+                <fee:cd avail="true">
+                    <fee:object>
+                        <domain:name>example.tld</domain:name>
+                    </fee:object>
+                    <fee:command>create</fee:command>
+                    <fee:currency>USD</fee:currency>
+                    <fee:period unit="y">1</fee:period>
+                    <fee:fee description="create">59.00</fee:fee>
+                    <fee:class>premium</fee:class>
+                </fee:cd>
+            </fee:chkData>
+        </extension>
+        <trID>
+            <svTRID>zpFtnGFRSKi9GbnQgwWvHQ==-398f30</svTRID>
+        </trID>
+    </response>
+</epp>

core/src/test/resources/google/registry/flows/domain_check_fee_response_normalized_v12.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" xmlns:bulkToken="urn:google:params:xml:ns:bulkToken-1.0" xmlns:fee="urn:ietf:params:xml:ns:fee-0.12" xmlns:launch="urn:ietf:params:xml:ns:launch-1.0" xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" xmlns:host="urn:ietf:params:xml:ns:host-1.0">
+    <response>
+        <result code="1000">
+            <msg>Command completed successfully</msg>
+        </result>
+        <resData>
+            <domain:chkData>
+                <domain:cd>
+                    <domain:name avail="true">example.tld</domain:name>
+                </domain:cd>
+            </domain:chkData>
+        </resData>
+        <extension>
+            <fee:chkData>
+                <fee:cd>
+                    <fee:object>
+                        <domain:name>example.tld</domain:name>
+                    </fee:object>
+                    <fee:command name="create">
+                        <fee:period unit="y">1</fee:period>
+                        <fee:fee description="create">10.00</fee:fee>
+                    </fee:command>
+                </fee:cd>
+                <fee:cd>
+                    <fee:object>
+                        <domain:name>example.tld</domain:name>
+                    </fee:object>
+                    <fee:command name="renew">
+                        <fee:period unit="y">1</fee:period>
+                        <fee:fee description="renew">14.00</fee:fee>
+                    </fee:command>
+                </fee:cd>
+                <fee:cd>
+                    <fee:object>
+                        <domain:name>example.tld</domain:name>
+                    </fee:object>
+                    <fee:command name="transfer">
+                        <fee:period unit="y">1</fee:period>
+                        <fee:fee description="renew">14.00</fee:fee>
+                    </fee:command>
+                </fee:cd>
+                <fee:cd>
+                    <fee:object>
+                        <domain:name>example.tld</domain:name>
+                    </fee:object>
+                    <fee:command name="restore">
+                        <fee:period unit="y">1</fee:period>
+                        <fee:fee description="restore">50.00</fee:fee>
+                    </fee:command>
+                </fee:cd>
+            </fee:chkData>
+        </extension>
+        <trID>
+            <clTRID>INWX-1769812282346</clTRID>
+            <svTRID>qV9Z6YAdRDeLdt5BjdSDwA==-3dd244</svTRID>
+        </trID>
+    </response>
+</epp>

core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_stdv1.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xmlns:fee="urn:ietf:params:xml:ns:fee-0.6" xmlns:fee_1_00="urn:ietf:params:xml:ns:epp:fee-1.0" xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" xmlns:bulkToken="urn:google:params:xml:ns:bulkToken-1.0" xmlns:fee11="urn:ietf:params:xml:ns:fee-0.11" xmlns:fee12="urn:ietf:params:xml:ns:fee-0.12" xmlns:launch="urn:ietf:params:xml:ns:launch-1.0" xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" xmlns:host="urn:ietf:params:xml:ns:host-1.0">
+    <response>
+        <result code="1000">
+            <msg>Command completed successfully</msg>
+        </result>
+        <resData>
+            <domain:chkData>
+                <domain:cd>
+                    <domain:name avail="false">example.tld</domain:name>
+                    <domain:reason>Reserved; alloc. token required</domain:reason>
+                </domain:cd>
+            </domain:chkData>
+        </resData>
+        <extension>
+            <fee_1_00:chkData>
+                <fee_1_00:currency>USD</fee_1_00:currency>
+                <fee_1_00:cd>
+                    <fee_1_00:objID>example.tld</fee_1_00:objID>
+                    <fee_1_00:class>reserved</fee_1_00:class>
+                    <fee_1_00:command name="create">
+                        <fee_1_00:period unit="y">1</fee_1_00:period>
+                    </fee_1_00:command>
+                </fee_1_00:cd>
+                <fee_1_00:cd>
+                    <fee_1_00:objID>example.tld</fee_1_00:objID>
+                    <fee_1_00:class>premium</fee_1_00:class>
+                    <fee_1_00:command name="renew">
+                        <fee_1_00:period unit="y">1</fee_1_00:period>
+                        <fee_1_00:fee description="renew">499.00</fee_1_00:fee>
+                    </fee_1_00:command>
+                </fee_1_00:cd>
+                <fee_1_00:cd>
+                    <fee_1_00:objID>example.tld</fee_1_00:objID>
+                    <fee_1_00:class>premium</fee_1_00:class>
+                    <fee_1_00:command name="transfer">
+                        <fee_1_00:period unit="y">1</fee_1_00:period>
+                        <fee_1_00:fee description="renew">499.00</fee_1_00:fee>
+                    </fee_1_00:command>
+                </fee_1_00:cd>
+            </fee_1_00:chkData>
+        </extension>
+        <trID>
+            <clTRID>ff25dfc7-2025-469a-baec-bedde73e74de</clTRID>
+            <svTRID>k5VIs5JMR1SRbx3TY6pAxQ==-2c52e</svTRID>
+        </trID>
+    </response>
+</epp>

core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v06.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xmlns:fee="urn:ietf:params:xml:ns:fee-0.6" xmlns:fee_1_00="urn:ietf:params:xml:ns:epp:fee-1.0" xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" xmlns:bulkToken="urn:google:params:xml:ns:bulkToken-1.0" xmlns:fee11="urn:ietf:params:xml:ns:fee-0.11" xmlns:fee12="urn:ietf:params:xml:ns:fee-0.12" xmlns:launch="urn:ietf:params:xml:ns:launch-1.0" xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" xmlns:host="urn:ietf:params:xml:ns:host-1.0">
+    <response>
+        <result code="1000">
+            <msg>Command completed successfully</msg>
+        </result>
+        <resData>
+            <domain:chkData>
+                <domain:cd>
+                    <domain:name avail="true">example.tld</domain:name>
+                </domain:cd>
+            </domain:chkData>
+        </resData>
+        <extension>
+            <fee:chkData>
+                <fee:cd>
+                    <fee:name>example.tld</fee:name>
+                    <fee:currency>USD</fee:currency>
+                    <fee:command>create</fee:command>
+                    <fee:period unit="y">1</fee:period>
+                    <fee:fee description="create">10.00</fee:fee>
+                </fee:cd>
+                <fee:cd>
+                    <fee:name>example.tld</fee:name>
+                    <fee:currency>USD</fee:currency>
+                    <fee:command>renew</fee:command>
+                    <fee:period unit="y">1</fee:period>
+                    <fee:fee description="renew">12.00</fee:fee>
+                </fee:cd>
+                <fee:cd>
+                    <fee:name>example.tld</fee:name>
+                    <fee:currency>USD</fee:currency>
+                    <fee:command>transfer</fee:command>
+                    <fee:period unit="y">1</fee:period>
+                    <fee:fee description="renew">12.00</fee:fee>
+                </fee:cd>
+                <fee:cd>
+                    <fee:name>example.tld</fee:name>
+                    <fee:currency>USD</fee:currency>
+                    <fee:command>restore</fee:command>
+                    <fee:period unit="y">1</fee:period>
+                    <fee:fee description="restore">50.00</fee:fee>
+                </fee:cd>
+            </fee:chkData>
+        </extension>
+        <trID>
+            <clTRID>trid</clTRID>
+            <svTRID>PAYQRVV3Q4eeq5B5FMvtmQ==-3406e2</svTRID>
+        </trID>
+    </response>
+</epp>

core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v11.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xmlns:fee="urn:ietf:params:xml:ns:fee-0.6" xmlns:fee_1_00="urn:ietf:params:xml:ns:epp:fee-1.0" xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" xmlns:bulkToken="urn:google:params:xml:ns:bulkToken-1.0" xmlns:fee11="urn:ietf:params:xml:ns:fee-0.11" xmlns:fee12="urn:ietf:params:xml:ns:fee-0.12" xmlns:launch="urn:ietf:params:xml:ns:launch-1.0" xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" xmlns:host="urn:ietf:params:xml:ns:host-1.0">
+    <response>
+        <result code="1000">
+            <msg>Command completed successfully</msg>
+        </result>
+        <resData>
+            <domain:chkData>
+                <domain:cd>
+                    <domain:name avail="true">example.tld</domain:name>
+                </domain:cd>
+            </domain:chkData>
+        </resData>
+        <extension>
+            <fee11:chkData>
+                <fee11:cd avail="true">
+                    <fee11:object>
+                        <domain:name>example.tld</domain:name>
+                    </fee11:object>
+                    <fee11:command>create</fee11:command>
+                    <fee11:currency>USD</fee11:currency>
+                    <fee11:period unit="y">1</fee11:period>
+                    <fee11:fee description="create">59.00</fee11:fee>
+                    <fee11:class>premium</fee11:class>
+                </fee11:cd>
+            </fee11:chkData>
+        </extension>
+        <trID>
+            <svTRID>zpFtnGFRSKi9GbnQgwWvHQ==-398f30</svTRID>
+        </trID>
+    </response>
+</epp>

core/src/test/resources/google/registry/flows/domain_check_fee_response_raw_v12.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xmlns:fee="urn:ietf:params:xml:ns:fee-0.6" xmlns:fee_1_00="urn:ietf:params:xml:ns:epp:fee-1.0" xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" xmlns:bulkToken="urn:google:params:xml:ns:bulkToken-1.0" xmlns:fee11="urn:ietf:params:xml:ns:fee-0.11" xmlns:fee12="urn:ietf:params:xml:ns:fee-0.12" xmlns:launch="urn:ietf:params:xml:ns:launch-1.0" xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" xmlns:host="urn:ietf:params:xml:ns:host-1.0">
+    <response>
+        <result code="1000">
+            <msg>Command completed successfully</msg>
+        </result>
+        <resData>
+            <domain:chkData>
+                <domain:cd>
+                    <domain:name avail="true">example.tld</domain:name>
+                </domain:cd>
+            </domain:chkData>
+        </resData>
+        <extension>
+            <fee12:chkData>
+                <fee12:cd>
+                    <fee12:object>
+                        <domain:name>example.tld</domain:name>
+                    </fee12:object>
+                    <fee12:command name="create">
+                        <fee12:period unit="y">1</fee12:period>
+                        <fee12:fee description="create">10.00</fee12:fee>
+                    </fee12:command>
+                </fee12:cd>
+                <fee12:cd>
+                    <fee12:object>
+                        <domain:name>example.tld</domain:name>
+                    </fee12:object>
+                    <fee12:command name="renew">
+                        <fee12:period unit="y">1</fee12:period>
+                        <fee12:fee description="renew">14.00</fee12:fee>
+                    </fee12:command>
+                </fee12:cd>
+                <fee12:cd>
+                    <fee12:object>
+                        <domain:name>example.tld</domain:name>
+                    </fee12:object>
+                    <fee12:command name="transfer">
+                        <fee12:period unit="y">1</fee12:period>
+                        <fee12:fee description="renew">14.00</fee12:fee>
+                    </fee12:command>
+                </fee12:cd>
+                <fee12:cd>
+                    <fee12:object>
+                        <domain:name>example.tld</domain:name>
+                    </fee12:object>
+                    <fee12:command name="restore">
+                        <fee12:period unit="y">1</fee12:period>
+                        <fee12:fee description="restore">50.00</fee12:fee>
+                    </fee12:command>
+                </fee12:cd>
+            </fee12:chkData>
+        </extension>
+        <trID>
+            <clTRID>INWX-1769812282346</clTRID>
+            <svTRID>qV9Z6YAdRDeLdt5BjdSDwA==-3dd244</svTRID>
+        </trID>
+    </response>
+</epp>

core/src/test/resources/google/registry/flows/domain_check_fee_response_thirty_domains_normalized_v06.xml

@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<epp xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xmlns:fee="urn:ietf:params:xml:ns:fee-0.6" xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" xmlns:launch="urn:ietf:params:xml:ns:launch-1.0" xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" xmlns:host="urn:ietf:params:xml:ns:host-1.0">
+  <response>
+    <result code="1000">
+      <msg>Command completed successfully</msg>
+    </result>
+    <resData>
+      <domain:chkData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:cd>
+          <domain:name avail="true">example-00.tld</domain:name>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-01.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-02.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-03.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-04.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-05.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-06.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-07.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-08.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-09.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-10.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-11.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-12.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-13.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-14.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-15.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-16.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-17.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-18.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-19.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-20.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-21.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-22.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-23.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-24.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-25.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-26.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-27.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-28.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-29.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+      </domain:chkData>
+    </resData>
+    <extension>
+      <fee:chkData>
+        <fee:cd>
+          <fee:name>example-00.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-01.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-02.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-03.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-04.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-05.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-06.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-07.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-08.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-09.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-10.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-11.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-12.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-13.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-14.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-15.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-16.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-17.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-18.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-19.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-20.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-21.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-22.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-23.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-24.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-25.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-26.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-27.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-28.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-29.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+      </fee:chkData>
+    </extension>
+    <trID>
+      <clTRID>ABC-12345</clTRID>
+      <svTRID>server-trid</svTRID>
+    </trID>
+  </response>
+</epp>

core/src/test/resources/google/registry/flows/domain_check_fee_response_thirty_domains_raw_v06.xml

@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<epp xmlns:domain="urn:ietf:params:xml:ns:domain-1.0" xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xmlns:fee="urn:ietf:params:xml:ns:fee-0.6" xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0" xmlns:fee11="urn:ietf:params:xml:ns:fee-0.11" xmlns:fee12="urn:ietf:params:xml:ns:fee-0.12" xmlns:fee_1_00="urn:ietf:params:xml:ns:epp:fee-1.0" xmlns:launch="urn:ietf:params:xml:ns:launch-1.0" xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1" xmlns:host="urn:ietf:params:xml:ns:host-1.0">
+  <response>
+    <result code="1000">
+      <msg>Command completed successfully</msg>
+    </result>
+    <resData>
+      <domain:chkData xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:cd>
+          <domain:name avail="true">example-00.tld</domain:name>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-01.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-02.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-03.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-04.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-05.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-06.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-07.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-08.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-09.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-10.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-11.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-12.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-13.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-14.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-15.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-16.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-17.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-18.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-19.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-20.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-21.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-22.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-23.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-24.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-25.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-26.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-27.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-28.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+        <domain:cd>
+          <domain:name avail="false">example-29.tld</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+      </domain:chkData>
+    </resData>
+    <extension>
+      <fee:chkData>
+        <fee:cd>
+          <fee:name>example-00.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-01.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-02.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-03.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-04.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-05.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-06.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-07.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-08.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-09.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-10.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-11.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-12.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-13.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-14.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-15.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-16.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-17.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-18.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-19.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-20.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-21.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-22.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-23.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-24.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-25.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-26.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-27.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-28.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+        <fee:cd>
+          <fee:name>example-29.tld</fee:name>
+          <fee:currency>USD</fee:currency>
+          <fee:command>restore</fee:command>
+          <fee:period unit="y">1</fee:period>
+          <fee:fee description="restore">17.00</fee:fee>
+          <fee:fee description="renew">11.00</fee:fee>
+        </fee:cd>
+      </fee:chkData>
+    </extension>
+    <trID>
+      <clTRID>ABC-12345</clTRID>
+      <svTRID>server-trid</svTRID>
+    </trID>
+  </response>
+</epp>

core/src/test/resources/google/registry/flows/greeting.xml

@@ -6,7 +6,6 @@
       <version>1.0</version>
       <lang>en</lang>
       <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
-      <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
       <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
       <svcExtension>
         <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>

core/src/test/resources/google/registry/flows/login.xml

@@ -10,7 +10,6 @@
       <svcs>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
         <svcExtension>
           <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
           <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>

core/src/test/resources/google/registry/flows/login_update_password.xml

@@ -11,7 +11,6 @@
       <svcs>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
         <svcExtension>
           <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
           <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>

core/src/test/resources/google/registry/flows/login_valid_fee_extension.xml

@@ -10,7 +10,6 @@
       <svcs>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
         <svcExtension>
           <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
           <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>

core/src/test/resources/google/registry/flows/login_wrong_case.xml

@@ -11,7 +11,6 @@
       <svcs>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
         <svcExtension>
           <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
           <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>

core/src/test/resources/google/registry/flows/session/greeting.xml

@@ -6,7 +6,6 @@
       <version>1.0</version>
       <lang>en</lang>
       <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
-      <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
       <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
       <svcExtension>
         <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>

core/src/test/resources/google/registry/flows/session/login_invalid_extension.xml

@@ -10,7 +10,6 @@
       <svcs>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
         <svcExtension>
           <extURI>http://custom/obj1ext-1.0</extURI>
         </svcExtension>

core/src/test/resources/google/registry/flows/session/login_invalid_language.xml

@@ -10,7 +10,6 @@
       <svcs>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
       </svcs>
     </login>
     <clTRID>ABC-12345</clTRID>

core/src/test/resources/google/registry/flows/session/login_invalid_types.xml

@@ -10,7 +10,6 @@
       <svcs>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:foo-1.0</objURI>
       </svcs>
     </login>

core/src/test/resources/google/registry/flows/session/login_invalid_version.xml

@@ -10,7 +10,6 @@
       <svcs>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
       </svcs>
     </login>
     <clTRID>ABC-12345</clTRID>

core/src/test/resources/google/registry/flows/session/login_set_new_password.xml

@@ -11,7 +11,6 @@
       <svcs>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
       </svcs>
     </login>
     <clTRID>ABC-12345</clTRID>

core/src/test/resources/google/registry/flows/session/login_valid.xml

@@ -10,7 +10,6 @@
       <svcs>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
       </svcs>
     </login>
     <clTRID>ABC-12345</clTRID>

core/src/test/resources/google/registry/flows/session/login_with_contact_objuri.xml

@@ -0,0 +1,18 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <login>
+      <clID>NewRegistrar</clID>
+      <pw>foo-BAR2</pw>
+      <options>
+        <version>1.0</version>
+        <lang>en</lang>
+      </options>
+      <svcs>
+        <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
+        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
+      </svcs>
+    </login>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>

core/src/test/resources/google/registry/flows/syntax_error.xml

@@ -12,7 +12,6 @@ xsi:schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd">
       </options>
       <svcs>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <svcExtension>
           <extURI>urn:ietf:params:xml:ns:secDNS-1.1</extURI>

core/src/test/resources/google/registry/model/eppinput/login_valid.xml

@@ -10,7 +10,6 @@
       <svcs>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
         <svcExtension>
           <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
           <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>

core/src/test/resources/google/registry/model/eppinput/login_wrong_case.xml

@@ -10,7 +10,6 @@
       <svcs>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
         <svcExtension>
           <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>
           <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>

core/src/test/resources/google/registry/tools/server/domain_create_complete.xml

@@ -12,9 +12,6 @@
           <domain:hostObj>ns3.zdns.google</domain:hostObj>
           <domain:hostObj>ns4.zdns.google</domain:hostObj>
         </domain:ns>
-        <domain:registrant>crr-admin</domain:registrant>
-        <domain:contact type="admin">crr-admin</domain:contact>
-        <domain:contact type="tech">crr-tech</domain:contact>
         <domain:authInfo>
           <domain:pw>2fooBAR</domain:pw>
         </domain:authInfo>

core/src/test/resources/google/registry/tools/server/domain_create_contacts.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
-  <command>
-    <create>
-      <domain:create
-       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
-        <domain:name>example.tld</domain:name>
-        <domain:period unit="y">1</domain:period>
-        <domain:registrant>crr-admin</domain:registrant>
-        <domain:contact type="admin">crr-admin</domain:contact>
-        <domain:contact type="tech">crr-tech</domain:contact>
-        <domain:authInfo>
-          <domain:pw>abcdefghijklmnop</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <clTRID>RegistryTool</clTRID>
-  </command>
-</epp>

core/src/test/resources/google/registry/tools/server/domain_create_metadata.xml

@@ -6,9 +6,6 @@
        xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.tld</domain:name>
         <domain:period unit="y">1</domain:period>
-        <domain:registrant>crr-admin</domain:registrant>
-        <domain:contact type="admin">crr-admin</domain:contact>
-        <domain:contact type="tech">crr-tech</domain:contact>
         <domain:authInfo>
           <domain:pw>abcdefghijklmnop</domain:pw>
         </domain:authInfo>

core/src/test/resources/google/registry/tools/server/domain_create_minimal_abc.xml

@@ -6,9 +6,6 @@
        xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.abc</domain:name>
         <domain:period unit="y">1</domain:period>
-        <domain:registrant>crr-admin</domain:registrant>
-        <domain:contact type="admin">crr-admin</domain:contact>
-        <domain:contact type="tech">crr-tech</domain:contact>
         <domain:authInfo>
           <domain:pw>abcdefghijklmnop</domain:pw>
         </domain:authInfo>

core/src/test/resources/google/registry/tools/server/domain_create_palladium.xml

@@ -6,9 +6,6 @@
         xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>palladium.tld</domain:name>
         <domain:period unit="y">1</domain:period>
-        <domain:registrant>crr-admin</domain:registrant>
-        <domain:contact type="admin">crr-admin</domain:contact>
-        <domain:contact type="tech">crr-tech</domain:contact>
         <domain:authInfo>
           <domain:pw>abcdefghijklmnop</domain:pw>
         </domain:authInfo>

core/src/test/resources/google/registry/tools/server/domain_create_parajiumu_3yrs.xml

@@ -6,9 +6,6 @@
         xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>parajiumu.baar</domain:name>
         <domain:period unit="y">3</domain:period>
-        <domain:registrant>crr-admin</domain:registrant>
-        <domain:contact type="admin">crr-admin</domain:contact>
-        <domain:contact type="tech">crr-tech</domain:contact>
         <domain:authInfo>
           <domain:pw>abcdefghijklmnop</domain:pw>
         </domain:authInfo>

core/src/test/resources/google/registry/tools/server/domain_create_token.xml

@@ -6,9 +6,6 @@
           xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.tld</domain:name>
         <domain:period unit="y">1</domain:period>
-        <domain:registrant>crr-admin</domain:registrant>
-        <domain:contact type="admin">crr-admin</domain:contact>
-        <domain:contact type="tech">crr-tech</domain:contact>
         <domain:authInfo>
           <domain:pw>abcdefghijklmnop</domain:pw>
         </domain:authInfo>

core/src/test/resources/google/registry/tools/server/domain_update_add.xml

@@ -10,8 +10,6 @@
             <domain:hostObj>ns2.zdns.google</domain:hostObj>
             <domain:hostObj>ns3.zdns.google</domain:hostObj>
           </domain:ns>
-          <domain:contact type="admin">crr-admin2</domain:contact>
-          <domain:contact type="tech">crr-tech2</domain:contact>
           <domain:status s="serverDeleteProhibited"/>
         </domain:add>
       </domain:update>

core/src/test/resources/google/registry/tools/server/domain_update_add_nameserver.xml

@@ -6,13 +6,10 @@
        xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.tld</domain:name>
         <domain:add>
-          <domain:contact type="admin">crr-admin3</domain:contact>
-          <domain:contact type="tech">crr-tech3</domain:contact>
+          <domain:ns>
+            <domain:hostObj>ns2.zdns.google</domain:hostObj>
+          </domain:ns>
         </domain:add>
-        <domain:rem>
-          <domain:contact type="admin">crr-admin1</domain:contact>
-          <domain:contact type="tech">crr-tech1</domain:contact>
-        </domain:rem>
       </domain:update>
     </update>
     <clTRID>RegistryTool</clTRID>

core/src/test/resources/google/registry/tools/server/domain_update_change.xml

@@ -6,7 +6,6 @@
        xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.tld</domain:name>
         <domain:chg>
-          <domain:registrant>crr-admin</domain:registrant>
           <domain:authInfo>
             <domain:pw>2fooBAR</domain:pw>
           </domain:authInfo>

core/src/test/resources/google/registry/tools/server/domain_update_change_metadata.xml

@@ -6,7 +6,6 @@
        xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.tld</domain:name>
         <domain:chg>
-          <domain:registrant>crr-admin</domain:registrant>
           <domain:authInfo>
             <domain:pw>2fooBAR</domain:pw>
           </domain:authInfo>

core/src/test/resources/google/registry/tools/server/domain_update_complete.xml

@@ -10,8 +10,6 @@
             <domain:hostObj>ns1.zdns.google</domain:hostObj>
             <domain:hostObj>ns2.zdns.google</domain:hostObj>
           </domain:ns>
-          <domain:contact type="admin">crr-admin2</domain:contact>
-          <domain:contact type="tech">crr-tech2</domain:contact>
           <domain:status s="serverDeleteProhibited"/>
         </domain:add>
         <domain:rem>
@@ -19,12 +17,9 @@
             <domain:hostObj>ns3.zdns.google</domain:hostObj>
             <domain:hostObj>ns4.zdns.google</domain:hostObj>
           </domain:ns>
-          <domain:contact type="admin">crr-admin1</domain:contact>
-          <domain:contact type="tech">crr-tech1</domain:contact>
           <domain:status s="serverHold"/>
         </domain:rem>
         <domain:chg>
-          <domain:registrant>crr-admin</domain:registrant>
           <domain:authInfo>
             <domain:pw>2fooBAR</domain:pw>
           </domain:authInfo>

core/src/test/resources/google/registry/tools/server/domain_update_complete_abc.xml

@@ -10,8 +10,6 @@
             <domain:hostObj>ns1.zdns.google</domain:hostObj>
             <domain:hostObj>ns2.zdns.google</domain:hostObj>
           </domain:ns>
-          <domain:contact type="admin">crr-admin2</domain:contact>
-          <domain:contact type="tech">crr-tech2</domain:contact>
           <domain:status s="serverDeleteProhibited"/>
         </domain:add>
         <domain:rem>
@@ -19,12 +17,9 @@
             <domain:hostObj>ns3.zdns.google</domain:hostObj>
             <domain:hostObj>ns4.zdns.google</domain:hostObj>
           </domain:ns>
-          <domain:contact type="admin">crr-admin1</domain:contact>
-          <domain:contact type="tech">crr-tech1</domain:contact>
           <domain:status s="serverHold"/>
         </domain:rem>
         <domain:chg>
-          <domain:registrant>crr-admin</domain:registrant>
           <domain:authInfo>
             <domain:pw>2fooBAR</domain:pw>
           </domain:authInfo>

core/src/test/resources/google/registry/tools/server/domain_update_remove.xml

@@ -9,8 +9,6 @@
           <domain:ns>
             <domain:hostObj>ns4.zdns.google</domain:hostObj>
           </domain:ns>
-          <domain:contact type="admin">crr-admin1</domain:contact>
-          <domain:contact type="tech">crr-tech1</domain:contact>
           <domain:status s="serverHold"/>
         </domain:rem>
       </domain:update>

db/src/main/resources/sql/schema/db-schema.sql.generated

@@ -467,7 +467,7 @@
     );
 
     create table "FeatureFlag" (
-        feature_name text not null check (feature_name in ('TEST_FEATURE','MINIMUM_DATASET_CONTACTS_OPTIONAL','MINIMUM_DATASET_CONTACTS_PROHIBITED','INCLUDE_PENDING_DELETE_DATE_FOR_DOMAINS')),
+        feature_name text not null check (feature_name in ('TEST_FEATURE','MINIMUM_DATASET_CONTACTS_OPTIONAL','MINIMUM_DATASET_CONTACTS_PROHIBITED','INCLUDE_PENDING_DELETE_DATE_FOR_DOMAINS','PROHIBIT_CONTACT_OBJECTS_ON_LOGIN')),
         status hstore not null,
         primary key (feature_name)
     );

jetty/start.sh

@@ -21,8 +21,19 @@ cd webapps
 find . -maxdepth 1 -type d -name "console-*" -exec rm -rf {} +
 cd /jetty-base
 echo "Running ${env}"
-# Use the CONTAINER_NAME variable from Kubernetes YAML to set the profiler service name.
-java -agentpath:/opt/cprof/profiler_java_agent.so=-cprof_service=${CONTAINER_NAME},-cprof_enable_heap_sampling=true \
-    -Dgoogle.registry.environment=${env} \
-    -Djava.util.logging.config.file=/logging.properties \
+PROFILER_ARGS=""
+# Use the CONTAINER_NAME variable from Kubernetes YAML to set Cloud profiler args, enable it only in frontend and console.
+case "${CONTAINER_NAME}" in
+  "frontend"|"console")
+  PROFILER_ARGS="-agentpath:/opt/cprof/profiler_java_agent.so=-cprof_service=${CONTAINER_NAME},-cprof_enable_heap_sampling=true"
+esac
+JVM_OPTS=(
+    # Allocate bigger than default fraction of available memory to the
+    # application, as it's running in a (single-purposed) container.
+    -XX:InitialRAMPercentage=50.0
+    -XX:MaxRAMPercentage=50.0
+    -Dgoogle.registry.environment="${env}"
+    -Djava.util.logging.config.file=/logging.properties
     -jar /usr/local/jetty/start.jar
+)
+java $PROFILER_ARGS "${JVM_OPTS[@]}"

load-testing/src/main/java/google/registry/client/resources/login.xml

@@ -11,7 +11,6 @@
     <svcs>
       <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
       <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-      <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
     </svcs>
   </login>
   <clTRID>epp-client-login-@@NOW@@-@@CHANNEL_NUMBER@@</clTRID>

prober/src/main/resources/google/registry/monitoring/blackbox/message/greeting.xml

@@ -5,7 +5,6 @@
     <svcMenu>
       <version>1.0</version>
       <lang>en</lang>
-      <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
       <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
       <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
     </svcMenu>

prober/src/main/resources/google/registry/monitoring/blackbox/message/login.xml

@@ -10,7 +10,6 @@
       </options>
       <svcs>
         <objURI>urn:ietf:params:xml:ns:domain-1.0</objURI>
-        <objURI>urn:ietf:params:xml:ns:contact-1.0</objURI>
         <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
         <svcExtension>
           <extURI>urn:ietf:params:xml:ns:launch-1.0</extURI>

release/cloudbuild-nomulus.yaml

@@ -155,9 +155,7 @@ steps:
       google.registry.beam.rde.RdePipeline \
       google/registry/beam/rde_pipeline_metadata.json \
       google.registry.beam.resave.ResaveAllEppResourcesPipeline \
-      google/registry/beam/resave_all_epp_resources_pipeline_metadata.json \
-      google.registry.beam.wipeout.WipeOutContactHistoryPiiPipeline \
-      google/registry/beam/wipe_out_contact_history_pii_pipeline_metadata.json
+      google/registry/beam/resave_all_epp_resources_pipeline_metadata.json
 # Build and upload the schema jar as well as other artifacts needed by the schema tests.
 - name: 'gcr.io/${PROJECT_ID}/builder:latest'
   entrypoint: /bin/bash