Fix Jetty start script (#2958)

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

Refactored into comment-safe format.

core/build.gradle

@@ -569,11 +569,6 @@ if (environment == 'alpha') {
               mainClass: 'google.registry.beam.resave.ResaveAllEppResourcesPipeline',
               metaData: 'google/registry/beam/resave_all_epp_resources_pipeline_metadata.json'
           ],
-      wipeOutContactHistoryPii:
-              [
-                      mainClass: 'google.registry.beam.wipeout.WipeOutContactHistoryPiiPipeline',
-                      metaData: 'google/registry/beam/wipe_out_contact_history_pii_pipeline_metadata.json'
-              ],
   ]
   project.tasks.create("stageBeamPipelines") {
     doLast {

core/src/main/java/google/registry/batch/BatchModule.java

@@ -131,12 +131,6 @@ public class BatchModule {
     return extractOptionalDatetimeParameter(req, ExpandBillingRecurrencesAction.PARAM_END_TIME);
   }
 
-  @Provides
-  @Parameter(WipeOutContactHistoryPiiAction.PARAM_CUTOFF_TIME)
-  static Optional<DateTime> provideCutoffTime(HttpServletRequest req) {
-    return extractOptionalDatetimeParameter(req, WipeOutContactHistoryPiiAction.PARAM_CUTOFF_TIME);
-  }
-
   @Provides
   @Parameter(ExpandBillingRecurrencesAction.PARAM_ADVANCE_CURSOR)
   static boolean provideAdvanceCursor(HttpServletRequest req) {

core/src/main/java/google/registry/batch/RemoveAllDomainContactsAction.java

@@ -1,238 +0,0 @@
-// Copyright 2025 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.batch;
-
-import static com.google.common.net.MediaType.PLAIN_TEXT_UTF_8;
-import static google.registry.flows.FlowUtils.marshalWithLenientRetry;
-import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
-import static google.registry.util.DateTimeUtils.END_OF_TIME;
-import static google.registry.util.ResourceUtils.readResourceUtf8;
-import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
-import static jakarta.servlet.http.HttpServletResponse.SC_NO_CONTENT;
-import static jakarta.servlet.http.HttpServletResponse.SC_OK;
-import static java.nio.charset.StandardCharsets.US_ASCII;
-
-import com.google.common.base.Ascii;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.flogger.FluentLogger;
-import com.google.common.util.concurrent.RateLimiter;
-import google.registry.config.RegistryConfig.Config;
-import google.registry.flows.EppController;
-import google.registry.flows.EppRequestSource;
-import google.registry.flows.PasswordOnlyTransportCredentials;
-import google.registry.flows.StatelessRequestSessionMetadata;
-import google.registry.model.contact.Contact;
-import google.registry.model.domain.DesignatedContact;
-import google.registry.model.domain.Domain;
-import google.registry.model.eppcommon.ProtocolDefinition;
-import google.registry.model.eppoutput.EppOutput;
-import google.registry.persistence.VKey;
-import google.registry.request.Action;
-import google.registry.request.Response;
-import google.registry.request.auth.Auth;
-import google.registry.request.lock.LockHandler;
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.logging.Level;
-import javax.annotation.Nullable;
-import org.joda.time.Duration;
-
-/**
- * An action that removes all contacts from all active (non-deleted) domains.
- *
- * <p>This implements part 1 of phase 3 of the Minimum Dataset migration, wherein we remove all uses
- * of contact objects in preparation for later removing all contact data from the system.
- *
- * <p>This runs as a singly threaded, resumable action that loads batches of domains still
- * containing contacts, and runs a superuser domain update on each one to remove the contacts,
- * leaving behind a record recording that update.
- */
-@Action(
-    service = Action.Service.BACKEND,
-    path = RemoveAllDomainContactsAction.PATH,
-    method = Action.Method.POST,
-    auth = Auth.AUTH_ADMIN)
-public class RemoveAllDomainContactsAction implements Runnable {
-
-  public static final String PATH = "/_dr/task/removeAllDomainContacts";
-  private static final String LOCK_NAME = "Remove all domain contacts";
-  private static final String CONTACT_FMT = "<domain:contact type=\"%s\">%s</domain:contact>";
-
-  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
-  private final EppController eppController;
-  private final String registryAdminClientId;
-  private final LockHandler lockHandler;
-  private final RateLimiter rateLimiter;
-  private final Response response;
-  private final String updateDomainXml;
-  private int successes = 0;
-  private int failures = 0;
-
-  private static final int BATCH_SIZE = 10000;
-
-  @Inject
-  RemoveAllDomainContactsAction(
-      EppController eppController,
-      @Config("registryAdminClientId") String registryAdminClientId,
-      LockHandler lockHandler,
-      @Named("standardRateLimiter") RateLimiter rateLimiter,
-      Response response) {
-    this.eppController = eppController;
-    this.registryAdminClientId = registryAdminClientId;
-    this.lockHandler = lockHandler;
-    this.rateLimiter = rateLimiter;
-    this.response = response;
-    this.updateDomainXml =
-        readResourceUtf8(RemoveAllDomainContactsAction.class, "domain_remove_contacts.xml");
-  }
-
-  @Override
-  public void run() {
-    response.setContentType(PLAIN_TEXT_UTF_8);
-    Callable<Void> runner =
-        () -> {
-          try {
-            runLocked();
-            response.setStatus(SC_OK);
-          } catch (Exception e) {
-            logger.atSevere().withCause(e).log("Errored out during execution.");
-            response.setStatus(SC_INTERNAL_SERVER_ERROR);
-            response.setPayload(String.format("Errored out with cause: %s", e));
-          }
-          return null;
-        };
-
-    if (!lockHandler.executeWithLocks(runner, null, Duration.standardHours(1), LOCK_NAME)) {
-      // Send a 200-series status code to prevent this conflicting action from retrying.
-      response.setStatus(SC_NO_CONTENT);
-      response.setPayload("Could not acquire lock; already running?");
-    }
-  }
-
-  private void runLocked() {
-    logger.atInfo().log("Removing contacts on all active domains.");
-
-    List<String> domainRepoIdsBatch;
-    do {
-      domainRepoIdsBatch =
-          tm().<List<String>>transact(
-                  () ->
-                      tm().getEntityManager()
-                          .createQuery(
-                              """
-                              SELECT repoId FROM Domain WHERE deletionTime = :end_of_time AND NOT (
-                                adminContact IS NULL AND billingContact IS NULL
-                                AND registrantContact IS NULL AND techContact IS NULL)
-                              """)
-                          .setParameter("end_of_time", END_OF_TIME)
-                          .setMaxResults(BATCH_SIZE)
-                          .getResultList());
-
-      for (String domainRepoId : domainRepoIdsBatch) {
-        rateLimiter.acquire();
-        runDomainUpdateFlow(domainRepoId);
-      }
-    } while (!domainRepoIdsBatch.isEmpty());
-    String msg =
-        String.format(
-            "Finished; %d domains were successfully updated and %d errored out.",
-            successes, failures);
-    logger.at(failures == 0 ? Level.INFO : Level.WARNING).log(msg);
-    response.setPayload(msg);
-  }
-
-  private void runDomainUpdateFlow(String repoId) {
-    // Create a new transaction that the flow's execution will be enlisted in that loads the domain
-    // transactionally. This way we can ensure that nothing else has modified the domain in question
-    // in the intervening period since the query above found it. If a single domain update fails
-    // permanently, log it and move on to not block processing all the other domains.
-    try {
-      boolean success = tm().transact(() -> runDomainUpdateFlowInner(repoId));
-      if (success) {
-        successes++;
-      } else {
-        failures++;
-      }
-    } catch (Throwable t) {
-      logger.atWarning().withCause(t).log(
-          "Failed updating domain with repoId %s; skipping.", repoId);
-    }
-  }
-
-  /**
-   * Runs the actual domain update flow and returns whether the contact removals were successful.
-   */
-  private boolean runDomainUpdateFlowInner(String repoId) {
-    Domain domain = tm().loadByKey(VKey.create(Domain.class, repoId));
-    if (!domain.getDeletionTime().equals(END_OF_TIME)) {
-      // Domain has been deleted since the action began running; nothing further to be
-      // done here.
-      logger.atInfo().log("Nothing to process for deleted domain '%s'.", domain.getDomainName());
-      return false;
-    }
-    logger.atInfo().log("Attempting to remove contacts on domain '%s'.", domain.getDomainName());
-
-    StringBuilder sb = new StringBuilder();
-    ImmutableMap<VKey<? extends Contact>, Contact> contacts =
-        tm().loadByKeys(
-                domain.getContacts().stream()
-                    .map(DesignatedContact::getContactKey)
-                    .collect(ImmutableSet.toImmutableSet()));
-
-    // Collect all the (non-registrant) contacts referenced by the domain and compile an EPP XML
-    // string that removes each one.
-    for (DesignatedContact designatedContact : domain.getContacts()) {
-      @Nullable Contact contact = contacts.get(designatedContact.getContactKey());
-      if (contact == null) {
-        logger.atWarning().log(
-            "Domain '%s' referenced contact with repo ID '%s' that couldn't be" + " loaded.",
-            domain.getDomainName(), designatedContact.getContactKey().getKey());
-        continue;
-      }
-      sb.append(
-              String.format(
-                  CONTACT_FMT,
-                  Ascii.toLowerCase(designatedContact.getType().name()),
-                  contact.getContactId()))
-          .append("\n");
-    }
-
-    String compiledXml =
-        updateDomainXml
-            .replace("%DOMAIN%", domain.getDomainName())
-            .replace("%CONTACTS%", sb.toString());
-    EppOutput output =
-        eppController.handleEppCommand(
-            new StatelessRequestSessionMetadata(
-                registryAdminClientId, ProtocolDefinition.getVisibleServiceExtensionUris()),
-            new PasswordOnlyTransportCredentials(),
-            EppRequestSource.BACKEND,
-            false,
-            true,
-            compiledXml.getBytes(US_ASCII));
-    if (output.isSuccess()) {
-      logger.atInfo().log(
-          "Successfully removed contacts from domain '%s'.", domain.getDomainName());
-    } else {
-      logger.atWarning().log(
-          "Failed removing contacts from domain '%s' with error %s.",
-          domain.getDomainName(), new String(marshalWithLenientRetry(output), US_ASCII));
-    }
-    return output.isSuccess();
-  }
-}

core/src/main/java/google/registry/batch/WipeOutContactHistoryPiiAction.java

@@ -1,142 +0,0 @@
-// Copyright 2021 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.batch;
-
-import static google.registry.beam.BeamUtils.createJobName;
-import static google.registry.request.RequestParameters.PARAM_DRY_RUN;
-import static jakarta.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
-import static jakarta.servlet.http.HttpServletResponse.SC_OK;
-
-import com.google.api.services.dataflow.Dataflow;
-import com.google.api.services.dataflow.model.LaunchFlexTemplateParameter;
-import com.google.api.services.dataflow.model.LaunchFlexTemplateRequest;
-import com.google.api.services.dataflow.model.LaunchFlexTemplateResponse;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.flogger.FluentLogger;
-import com.google.common.net.MediaType;
-import google.registry.beam.wipeout.WipeOutContactHistoryPiiPipeline;
-import google.registry.config.RegistryConfig.Config;
-import google.registry.model.contact.ContactHistory;
-import google.registry.request.Action;
-import google.registry.request.Parameter;
-import google.registry.request.Response;
-import google.registry.request.auth.Auth;
-import google.registry.util.Clock;
-import google.registry.util.RegistryEnvironment;
-import jakarta.inject.Inject;
-import java.io.IOException;
-import java.util.Optional;
-import org.joda.time.DateTime;
-
-/**
- * An action that launches {@link WipeOutContactHistoryPiiPipeline} to wipe out Personal
- * Identifiable Information (PII) fields of {@link ContactHistory} entities.
- *
- * <p>{@link ContactHistory} entities should be retained in the database for only certain amount of
- * time.
- */
-@Action(
-    service = Action.Service.BACKEND,
-    path = WipeOutContactHistoryPiiAction.PATH,
-    auth = Auth.AUTH_ADMIN)
-public class WipeOutContactHistoryPiiAction implements Runnable {
-
-  public static final String PATH = "/_dr/task/wipeOutContactHistoryPii";
-  public static final String PARAM_CUTOFF_TIME = "wipeoutTime";
-  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
-  private static final String PIPELINE_NAME = "wipe_out_contact_history_pii_pipeline";
-
-  private final Clock clock;
-  private final boolean isDryRun;
-  private final Optional<DateTime> maybeCutoffTime;
-  private final int minMonthsBeforeWipeOut;
-  private final String stagingBucketUrl;
-  private final String projectId;
-  private final String jobRegion;
-  private final Dataflow dataflow;
-  private final Response response;
-
-  @Inject
-  public WipeOutContactHistoryPiiAction(
-      Clock clock,
-      @Parameter(PARAM_DRY_RUN) boolean isDryRun,
-      @Parameter(PARAM_CUTOFF_TIME) Optional<DateTime> maybeCutoffTime,
-      @Config("minMonthsBeforeWipeOut") int minMonthsBeforeWipeOut,
-      @Config("beamStagingBucketUrl") String stagingBucketUrl,
-      @Config("projectId") String projectId,
-      @Config("defaultJobRegion") String jobRegion,
-      Dataflow dataflow,
-      Response response) {
-    this.clock = clock;
-    this.isDryRun = isDryRun;
-    this.maybeCutoffTime = maybeCutoffTime;
-    this.minMonthsBeforeWipeOut = minMonthsBeforeWipeOut;
-    this.stagingBucketUrl = stagingBucketUrl;
-    this.projectId = projectId;
-    this.jobRegion = jobRegion;
-    this.dataflow = dataflow;
-    this.response = response;
-  }
-
-  @Override
-  public void run() {
-    response.setContentType(MediaType.PLAIN_TEXT_UTF_8);
-    DateTime cutoffTime =
-        maybeCutoffTime.orElse(clock.nowUtc().minusMonths(minMonthsBeforeWipeOut));
-    LaunchFlexTemplateParameter launchParameter =
-        new LaunchFlexTemplateParameter()
-            .setJobName(
-                createJobName(
-                    String.format(
-                        "contact-history-pii-wipeout-%s",
-                        cutoffTime.toString("yyyy-MM-dd't'HH-mm-ss'z'")),
-                    clock))
-            .setContainerSpecGcsPath(
-                String.format("%s/%s_metadata.json", stagingBucketUrl, PIPELINE_NAME))
-            .setParameters(
-                ImmutableMap.of(
-                    "registryEnvironment",
-                    RegistryEnvironment.get().name(),
-                    "cutoffTime",
-                    cutoffTime.toString("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"),
-                    "isDryRun",
-                    Boolean.toString(isDryRun)));
-    logger.atInfo().log(
-        "Launching Beam pipeline to wipe out all PII of contact history entities prior to %s%s.",
-        cutoffTime, " in dry run mode");
-    try {
-      LaunchFlexTemplateResponse launchResponse =
-          dataflow
-              .projects()
-              .locations()
-              .flexTemplates()
-              .launch(
-                  projectId,
-                  jobRegion,
-                  new LaunchFlexTemplateRequest().setLaunchParameter(launchParameter))
-              .execute();
-      logger.atInfo().log("Got response: %s", launchResponse.getJob().toPrettyString());
-      response.setStatus(SC_OK);
-      response.setPayload(
-          String.format(
-              "Launched contact history PII wipeout pipeline: %s",
-              launchResponse.getJob().getId()));
-    } catch (IOException e) {
-      logger.atWarning().withCause(e).log("Pipeline Launch failed");
-      response.setStatus(SC_INTERNAL_SERVER_ERROR);
-      response.setPayload(String.format("Pipeline launch failed: %s", e.getMessage()));
-    }
-  }
-}

core/src/main/java/google/registry/beam/wipeout/WipeOutContactHistoryPiiPipeline.java

@@ -1,166 +0,0 @@
-// Copyright 2023 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.beam.wipeout;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
-import static org.apache.beam.sdk.values.TypeDescriptors.voids;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Streams;
-import google.registry.beam.common.RegistryJpaIO;
-import google.registry.model.contact.ContactHistory;
-import google.registry.model.reporting.HistoryEntry.HistoryEntryId;
-import google.registry.persistence.PersistenceModule.TransactionIsolationLevel;
-import google.registry.persistence.VKey;
-import java.io.Serializable;
-import org.apache.beam.sdk.Pipeline;
-import org.apache.beam.sdk.PipelineResult;
-import org.apache.beam.sdk.coders.KvCoder;
-import org.apache.beam.sdk.coders.StringUtf8Coder;
-import org.apache.beam.sdk.coders.VarLongCoder;
-import org.apache.beam.sdk.metrics.Counter;
-import org.apache.beam.sdk.metrics.Metrics;
-import org.apache.beam.sdk.options.PipelineOptionsFactory;
-import org.apache.beam.sdk.transforms.MapElements;
-import org.apache.beam.sdk.transforms.join.CoGroupByKey;
-import org.apache.beam.sdk.transforms.join.KeyedPCollectionTuple;
-import org.apache.beam.sdk.values.KV;
-import org.apache.beam.sdk.values.PCollection;
-import org.apache.beam.sdk.values.TupleTag;
-import org.joda.time.DateTime;
-
-/**
- * Definition of a Dataflow Flex pipeline template, which finds out {@link ContactHistory} entries
- * that are older than a given age (excluding the most recent one, even if it falls with the range)
- * and wipe out PII information in them.
- *
- * <p>To stage this template locally, run {@code ./nom_build :core:sBP --environment=alpha \
- * --pipeline=wipeOutContactHistoryPii}.
- *
- * <p>Then, you can run the staged template via the API client library, gCloud or a raw REST call.
- */
-public class WipeOutContactHistoryPiiPipeline implements Serializable {
-
-  private static final long serialVersionUID = -4111052675715913820L;
-  private static final TupleTag<Long> REVISIONS_TO_WIPE = new TupleTag<>();
-  private static final TupleTag<Long> MOST_RECENT_REVISION = new TupleTag<>();
-
-  private final DateTime cutoffTime;
-  private final boolean dryRun;
-  private final Counter contactsInScope =
-      Metrics.counter("WipeOutContactHistoryPii", "contacts in scope");
-  private final Counter historiesToWipe =
-      Metrics.counter("WipeOutContactHistoryPii", "contact histories to wipe PII from");
-  private final Counter historiesWiped =
-      Metrics.counter("WipeOutContactHistoryPii", "contact histories actually updated");
-
-  WipeOutContactHistoryPiiPipeline(WipeOutContactHistoryPiiPipelineOptions options) {
-    dryRun = options.getIsDryRun();
-    cutoffTime = DateTime.parse(options.getCutoffTime());
-  }
-
-  void setup(Pipeline pipeline) {
-    KeyedPCollectionTuple.of(REVISIONS_TO_WIPE, getHistoryEntriesToWipe(pipeline))
-        .and(MOST_RECENT_REVISION, getMostRecentHistoryEntries(pipeline))
-        .apply("Group by contact", CoGroupByKey.create())
-        .apply(
-            "Wipe out PII",
-            MapElements.into(voids())
-                .via(
-                    kv -> {
-                      String repoId = kv.getKey();
-                      long mostRecentRevision = kv.getValue().getOnly(MOST_RECENT_REVISION);
-                      ImmutableList<Long> revisionsToWipe =
-                          Streams.stream(kv.getValue().getAll(REVISIONS_TO_WIPE))
-                              .filter(e -> e != mostRecentRevision)
-                              .collect(toImmutableList());
-                      if (revisionsToWipe.isEmpty()) {
-                        return null;
-                      }
-                      contactsInScope.inc();
-                      tm().transact(
-                              () -> {
-                                for (long revisionId : revisionsToWipe) {
-                                  historiesToWipe.inc();
-                                  ContactHistory history =
-                                      tm().loadByKey(
-                                              VKey.create(
-                                                  ContactHistory.class,
-                                                  new HistoryEntryId(repoId, revisionId)));
-                                  // In the unlikely case where multiple pipelines run at the
-                                  // same time, or where the runner decides to rerun a particular
-                                  // transform, we might have a history entry that has already been
-                                  // wiped at this point. There's no need to wipe it again.
-                                  if (!dryRun
-                                      && history.getContactBase().isPresent()
-                                      && history.getContactBase().get().getEmailAddress() != null) {
-                                    historiesWiped.inc();
-                                    tm().update(history.asBuilder().wipeOutPii().build());
-                                  }
-                                }
-                              });
-                      return null;
-                    }));
-  }
-
-  PCollection<KV<String, Long>> getHistoryEntriesToWipe(Pipeline pipeline) {
-    return pipeline.apply(
-        "Find contact histories to wipee",
-        // Email is one of the required fields in EPP, meaning it's initially not null when it
-        // is set by EPP flows (even though it is nullalbe in the SQL schema). Therefore,
-        // checking if it's null is one way to avoid processing contact history entities that
-        // have been processed previously. Refer to RFC 5733 for more information.
-        RegistryJpaIO.read(
-                "SELECT repoId, revisionId FROM ContactHistory WHERE resource.email IS NOT NULL"
-                    + " AND modificationTime < :cutoffTime",
-                ImmutableMap.of("cutoffTime", cutoffTime),
-                Object[].class,
-                row -> KV.of((String) row[0], (long) row[1]))
-            .withCoder(KvCoder.of(StringUtf8Coder.of(), VarLongCoder.of())));
-  }
-
-  PCollection<KV<String, Long>> getMostRecentHistoryEntries(Pipeline pipeline) {
-    return pipeline.apply(
-        "Find the most recent historiy entry for each contact",
-        RegistryJpaIO.read(
-                "SELECT repoId, revisionId FROM ContactHistory"
-                    + " WHERE (repoId, modificationTime) IN"
-                    + " (SELECT repoId, MAX(modificationTime) FROM ContactHistory GROUP BY repoId)",
-                ImmutableMap.of(),
-                Object[].class,
-                row -> KV.of((String) row[0], (long) row[1]))
-            .withCoder(KvCoder.of(StringUtf8Coder.of(), VarLongCoder.of())));
-  }
-
-  PipelineResult run(Pipeline pipeline) {
-    setup(pipeline);
-    return pipeline.run();
-  }
-
-  public static void main(String[] args) {
-    PipelineOptionsFactory.register(WipeOutContactHistoryPiiPipelineOptions.class);
-    WipeOutContactHistoryPiiPipelineOptions options =
-        PipelineOptionsFactory.fromArgs(args)
-            .withValidation()
-            .as(WipeOutContactHistoryPiiPipelineOptions.class);
-    // Repeatable read should be more than enough since we are dealing with old history entries that
-    // are otherwise immutable.
-    options.setIsolationOverride(TransactionIsolationLevel.TRANSACTION_REPEATABLE_READ);
-    Pipeline pipeline = Pipeline.create(options);
-    new WipeOutContactHistoryPiiPipeline(options).run(pipeline);
-  }
-}

core/src/main/java/google/registry/beam/wipeout/WipeOutContactHistoryPiiPipelineOptions.java

@@ -1,37 +0,0 @@
-// Copyright 2023 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.beam.wipeout;
-
-import google.registry.beam.common.RegistryPipelineOptions;
-import org.apache.beam.sdk.options.Default;
-import org.apache.beam.sdk.options.Description;
-
-public interface WipeOutContactHistoryPiiPipelineOptions extends RegistryPipelineOptions {
-
-  @Description(
-      "A contact history entry with a history modification time before this time will have its PII"
-          + " wiped, unless it is the most entry for the contact.")
-  String getCutoffTime();
-
-  void setCutoffTime(String value);
-
-  @Description(
-      "If true, the wiped out billing events will not be saved but the pipeline metrics counter"
-          + " will still be updated.")
-  @Default.Boolean(false)
-  boolean getIsDryRun();
-
-  void setIsDryRun(boolean value);
-}

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.
      */
@@ -1264,12 +1252,6 @@ public final class RegistryConfig {
       return ImmutableSet.copyOf(config.sslCertificateValidation.allowedEcdsaCurves);
     }
 
-    @Provides
-    @Config("minMonthsBeforeWipeOut")
-    public static int provideMinMonthsBeforeWipeOut(RegistryConfigSettings config) {
-      return config.contactHistory.minMonthsBeforeWipeOut;
-    }
-
     @Provides
     @Config("jdbcBatchSize")
     public static int provideHibernateJdbcBatchSize(RegistryConfigSettings config) {
@@ -1463,9 +1445,9 @@ public final class RegistryConfig {
     }
 
     @Provides
-    @Config("mosapiTldThreadCnt")
+    @Config("mosapiTldThreadCount")
     public static int provideMosapiTldThreads(RegistryConfigSettings config) {
-      return config.mosapi.tldThreadCnt;
+      return config.mosapi.tldThreadCount;
     }
 
     private static String formatComments(String text) {
@@ -1629,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

@@ -39,7 +39,6 @@ public class RegistryConfigSettings {
   public Beam beam;
   public RegistryTool registryTool;
   public SslCertificateValidation sslCertificateValidation;
-  public ContactHistory contactHistory;
   public DnsUpdate dnsUpdate;
   public BulkPricingPackageMonitoring bulkPricingPackageMonitoring;
   public Bsa bsa;
@@ -87,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;
@@ -223,11 +221,6 @@ public class RegistryConfigSettings {
     public String expirationWarningEmailSubjectText;
   }
 
-  /** Configuration for contact history. */
-  public static class ContactHistory {
-    public int minMonthsBeforeWipeOut;
-  }
-
   /** Configuration for dns update. */
   public static class DnsUpdate {
     public String dnsUpdateFailEmailSubjectText;
@@ -272,6 +265,6 @@ public class RegistryConfigSettings {
     public String entityType;
     public List<String> tlds;
     public List<String> services;
-    public int tldThreadCnt;
+    public int tldThreadCount;
   }
 }

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
 
@@ -450,11 +447,6 @@ registryTool:
   # OAuth client secret used by the tool.
   clientSecret: YOUR_CLIENT_SECRET
 
-# Configuration options for handling contact history.
-contactHistory:
-  # The number of months that a ContactHistory entity should be stored in the database.
-  minMonthsBeforeWipeOut: 18
-
 # Configuration options relevant to the DNS update functionality.
 dnsUpdate:
   dnsUpdateFailRegistryName: Example name
@@ -645,5 +637,5 @@ mosapi:
   # Provides a fixed thread pool for parallel TLD processing.
   # @see <a href="https://www.icann.org/mosapi-specification.pdf">
   # ICANN MoSAPI Specification, Section 12.3</a>
-  tldThreadCnt: 4
+  tldThreadCount: 4
 

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/FlowModule.java

@@ -22,7 +22,6 @@ import com.google.common.base.Strings;
 import dagger.Module;
 import dagger.Provides;
 import google.registry.flows.picker.FlowPicker;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.metadata.MetadataExtension;
 import google.registry.model.eppcommon.AuthInfo;
@@ -267,23 +266,6 @@ public class FlowModule {
     return builder;
   }
 
-  /**
-   * Provides a partially filled in {@link ContactHistory.Builder}
-   *
-   * <p>This is not marked with {@link FlowScope} so that each retry gets a fresh one. Otherwise,
-   * the fact that the builder is one-use would cause NPEs.
-   */
-  @Provides
-  static ContactHistory.Builder provideContactHistoryBuilder(
-      Trid trid,
-      @InputXml byte[] inputXmlBytes,
-      @Superuser boolean isSuperuser,
-      @RegistrarId String registrarId,
-      EppInput eppInput) {
-    return makeHistoryEntryBuilder(
-        new ContactHistory.Builder(), trid, inputXmlBytes, isSuperuser, registrarId, eppInput);
-  }
-
   /**
    * Provides a partially filled in {@link HostHistory.Builder}
    *

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

@@ -16,7 +16,6 @@ package google.registry.flows;
 
 import static com.google.common.collect.Sets.intersection;
 import static google.registry.model.EppResourceUtils.isLinked;
-import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
@@ -37,7 +36,6 @@ import google.registry.model.EppResource;
 import google.registry.model.EppResource.ForeignKeyedEppResource;
 import google.registry.model.EppResource.ResourceWithTransferData;
 import google.registry.model.ForeignKeyUtils;
-import google.registry.model.contact.Contact;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.Period;
@@ -124,14 +122,6 @@ public final class ResourceFlowUtils {
     }
   }
 
-  /** Check that the given AuthInfo is either missing or else is valid for the given resource. */
-  public static void verifyOptionalAuthInfo(Optional<AuthInfo> authInfo, Contact contact)
-      throws EppException {
-    if (authInfo.isPresent()) {
-      verifyAuthInfo(authInfo.get(), contact);
-    }
-  }
-
   /** Check that the given AuthInfo is either missing or else is valid for the given resource. */
   public static void verifyOptionalAuthInfo(Optional<AuthInfo> authInfo, Domain domain)
       throws EppException {
@@ -142,37 +132,14 @@ public final class ResourceFlowUtils {
 
   /** Check that the given {@link AuthInfo} is valid for the given domain. */
   public static void verifyAuthInfo(AuthInfo authInfo, Domain domain) throws EppException {
-    final String authRepoId = authInfo.getPw().getRepoId();
-    String authPassword = authInfo.getPw().getValue();
-    if (authRepoId == null) {
-      // If no roid is specified, check the password against the domain's password.
-      String domainPassword = domain.getAuthInfo().getPw().getValue();
-      if (!domainPassword.equals(authPassword)) {
-        throw new BadAuthInfoForResourceException();
-      }
-      return;
-    }
-    // The roid should match one of the contacts.
-    Optional<VKey<Contact>> foundContact =
-        domain.getReferencedContacts().stream()
-            .filter(key -> key.getKey().equals(authRepoId))
-            .findFirst();
-    if (foundContact.isEmpty()) {
+    String authRepoId = authInfo.getPw().getRepoId();
+    // Previously one could auth against a contact, but we no longer hold any contact info
+    if (authRepoId != null) {
       throw new BadAuthInfoForResourceException();
     }
-    // Check the authInfo against the contact.
-    verifyAuthInfo(authInfo, tm().loadByKey(foundContact.get()));
-  }
-
-  /** Check that the given {@link AuthInfo} is valid for the given contact. */
-  public static void verifyAuthInfo(AuthInfo authInfo, Contact contact) throws EppException {
-    String authRepoId = authInfo.getPw().getRepoId();
     String authPassword = authInfo.getPw().getValue();
-    String contactPassword = contact.getAuthInfo().getPw().getValue();
-    if (!contactPassword.equals(authPassword)
-        // It's unnecessary to specify a repoId on a contact auth info, but if it's there validate
-        // it. The usual case of this is validating a domain's auth using this method.
-        || (authRepoId != null && !authRepoId.equals(contact.getRepoId()))) {
+    String domainPassword = domain.getAuthInfo().getPw().getValue();
+    if (!domainPassword.equals(authPassword)) {
       throw new BadAuthInfoForResourceException();
     }
   }

core/src/main/java/google/registry/flows/domain/DomainCreateFlow.java

@@ -167,7 +167,6 @@ import org.joda.time.Duration;
  * @error {@link DomainFlowUtils.DomainLabelBlockedByBsaException}
  * @error {@link DomainFlowUtils.DomainLabelTooLongException}
  * @error {@link DomainFlowUtils.DomainReservedException}
- * @error {@link DomainFlowUtils.DuplicateContactForRoleException}
  * @error {@link DomainFlowUtils.EmptyDomainNamePartException}
  * @error {@link DomainFlowUtils.ExceedsMaxRegistrationYearsException}
  * @error {@link DomainFlowUtils.ExpiredClaimException}
@@ -188,7 +187,6 @@ import org.joda.time.Duration;
  * @error {@link DomainFlowUtils.MaxSigLifeNotSupportedException}
  * @error {@link DomainFlowUtils.MissingBillingAccountMapException}
  * @error {@link DomainFlowUtils.MissingClaimsNoticeException}
- * @error {@link DomainFlowUtils.MissingContactTypeException}
  * @error {@link DomainFlowUtils.NameserversNotAllowedForTldException}
  * @error {@link DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverAllowListException}
  * @error {@link DomainFlowUtils.PremiumNameBlockedException}
@@ -221,7 +219,8 @@ public final class DomainCreateFlow implements MutatingFlow {
   @Inject DomainPricingLogic pricingLogic;
   @Inject DomainDeletionTimeCache domainDeletionTimeCache;
 
-  @Inject DomainCreateFlow() {}
+  @Inject
+  DomainCreateFlow() {}
 
   @Override
   public EppResponse run() throws EppException {
@@ -378,12 +377,10 @@ public final class DomainCreateFlow implements MutatingFlow {
             .setLaunchNotice(hasClaimsNotice ? launchCreate.get().getNotice() : null)
             .setSmdId(signedMarkId)
             .setDsData(secDnsCreate.map(SecDnsCreateExtension::getDsData).orElse(null))
-            .setRegistrant(command.getRegistrant())
             .setAuthInfo(command.getAuthInfo())
             .setDomainName(targetId)
             .setNameservers(command.getNameservers().stream().collect(toImmutableSet()))
             .setStatusValues(statuses)
-            .setContacts(command.getContacts())
             .addGracePeriod(
                 GracePeriod.forBillingEvent(GracePeriodStatus.ADD, repoId, createBillingEvent))
             .setLordnPhase(

core/src/main/java/google/registry/flows/domain/DomainFlowTmchUtils.java

@@ -157,7 +157,8 @@ public final class DomainFlowTmchUtils {
   }
 
   /** The provided mark does not match the desired domain label. */
-  static class NoMarksFoundMatchingDomainException extends RequiredParameterMissingException {
+  public static class NoMarksFoundMatchingDomainException
+      extends RequiredParameterMissingException {
     public NoMarksFoundMatchingDomainException() {
       super("The provided mark does not match the desired domain label");
     }

core/src/main/java/google/registry/flows/domain/DomainFlowUtils.java

@@ -19,7 +19,6 @@ import static com.google.common.base.Preconditions.checkState;
 import static com.google.common.base.Strings.emptyToNull;
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableMap.toImmutableMap;
-import static com.google.common.collect.ImmutableSetMultimap.toImmutableSetMultimap;
 import static com.google.common.collect.Sets.difference;
 import static com.google.common.collect.Sets.intersection;
 import static com.google.common.collect.Sets.union;
@@ -45,10 +44,8 @@ import static google.registry.util.DateTimeUtils.END_OF_TIME;
 import static google.registry.util.DateTimeUtils.isAtOrAfter;
 import static google.registry.util.DateTimeUtils.leapSafeAddYears;
 import static google.registry.util.DomainNameUtils.ACE_PREFIX;
-import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.joining;
 
-import com.google.common.base.Ascii;
 import com.google.common.base.CharMatcher;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
@@ -57,9 +54,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
 import com.google.common.collect.Sets;
 import com.google.common.collect.Streams;
 import com.google.common.net.InternetDomainName;
@@ -81,14 +75,12 @@ 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.DesignatedContact.Type;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainCommand.Create;
 import google.registry.model.domain.DomainCommand.CreateOrUpdate;
 import google.registry.model.domain.DomainCommand.InvalidReferencesException;
 import google.registry.model.domain.DomainCommand.Update;
 import google.registry.model.domain.DomainHistory;
-import google.registry.model.domain.ForeignKeyedDesignatedContact;
 import google.registry.model.domain.Period;
 import google.registry.model.domain.Period.Unit;
 import google.registry.model.domain.fee.BaseFee;
@@ -133,10 +125,8 @@ import google.registry.tldconfig.idn.IdnLabelValidator;
 import google.registry.tools.DigestType;
 import google.registry.util.Idn;
 import java.math.BigDecimal;
-import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
@@ -405,22 +395,11 @@ public class DomainFlowUtils {
     return period;
   }
 
-  /** Verify that no linked resources have disallowed statuses. */
-  static void verifyNotInPendingDelete(
-      Set<DesignatedContact> contacts,
-      Optional<VKey<Contact>> registrant,
-      Set<VKey<Host>> nameservers)
-      throws EppException {
-    ImmutableList.Builder<VKey<? extends EppResource>> keysToLoad = new ImmutableList.Builder<>();
-    contacts.stream().map(DesignatedContact::getContactKey).forEach(keysToLoad::add);
-    registrant.ifPresent(keysToLoad::add);
-    keysToLoad.addAll(nameservers);
-    verifyNotInPendingDelete(EppResource.loadByCacheIfEnabled(keysToLoad.build()).values());
-  }
-
-  private static void verifyNotInPendingDelete(Iterable<EppResource> resources)
-      throws EppException {
-    for (EppResource resource : resources) {
+  /** Verify that no linked nameservers have disallowed statuses. */
+  static void verifyNotInPendingDelete(ImmutableSet<VKey<Host>> nameservers)
+      throws StatusProhibitsOperationException {
+    for (EppResource resource :
+        EppResource.loadByCacheIfEnabled(ImmutableSet.copyOf(nameservers)).values()) {
       if (resource.getStatusValues().contains(StatusValue.PENDING_DELETE)) {
         throw new LinkedResourceInPendingDeleteProhibitsOperationException(
             resource.getForeignKey());
@@ -428,15 +407,6 @@ public class DomainFlowUtils {
     }
   }
 
-  static void validateContactsHaveTypes(Set<DesignatedContact> contacts)
-      throws ParameterValuePolicyErrorException {
-    for (DesignatedContact contact : contacts) {
-      if (contact.getType() == null) {
-        throw new MissingContactTypeException();
-      }
-    }
-  }
-
   static void validateNameserversCountForTld(String tld, InternetDomainName domainName, int count)
       throws EppException {
     // For TLDs with a nameserver allow list, all domains must have at least 1 nameserver.
@@ -451,36 +421,22 @@ public class DomainFlowUtils {
     }
   }
 
-  static void validateNoDuplicateContacts(Set<DesignatedContact> contacts)
+  /** Enforces absence of contact data on creation as part of the Minimum Dataset requirements. */
+  static void enforceContactAbsencesOnCreate(Create create)
       throws ParameterValuePolicyErrorException {
-    ImmutableMultimap<Type, VKey<Contact>> contactsByType =
-        contacts.stream()
-            .collect(
-                toImmutableSetMultimap(
-                    DesignatedContact::getType, DesignatedContact::getContactKey));
-
-    // If any contact type has multiple contacts:
-    if (contactsByType.asMap().values().stream().anyMatch(v -> v.size() > 1)) {
-      // Find the duplicates.
-      Map<Type, Collection<VKey<Contact>>> dupeKeysMap =
-          Maps.filterEntries(contactsByType.asMap(), e -> e.getValue().size() > 1);
-      ImmutableList<VKey<Contact>> dupeKeys =
-          dupeKeysMap.values().stream().flatMap(Collection::stream).collect(toImmutableList());
-      // Load the duplicates in one batch.
-      Map<VKey<? extends Contact>, Contact> dupeContacts = tm().loadByKeys(dupeKeys);
-      ImmutableMultimap.Builder<Type, VKey<Contact>> typesMap = new ImmutableMultimap.Builder<>();
-      dupeKeysMap.forEach(typesMap::putAll);
-      // Create an error message showing the type and contact IDs of the duplicates.
-      throw new DuplicateContactForRoleException(
-          Multimaps.transformValues(typesMap.build(), key -> dupeContacts.get(key).getContactId()));
-    }
+    enforceContactAbsences(create.getRegistrant(), create.getContacts());
   }
 
-  /**
-   * Enforces the presence/absence of contact data on domain creates depending on the minimum data
-   * set migration schedule.
-   */
-  static void validateCreateContactData(
+  /** Enforces absence of contact data on update as part of the Minimum Dataset requirements. */
+  static void enforceContactAbsencesOnUpdate(Update update)
+      throws ParameterValuePolicyErrorException {
+    Set<DesignatedContact> allDesignatedContacts =
+        Sets.union(update.getInnerAdd().getContacts(), update.getInnerRemove().getContacts());
+    enforceContactAbsences(update.getInnerChange().getRegistrant(), allDesignatedContacts);
+  }
+
+  /** Enforces the absence of contact data as part of the Minimum Dataset requirements. */
+  static void enforceContactAbsences(
       Optional<VKey<Contact>> registrant, Set<DesignatedContact> contacts)
       throws ParameterValuePolicyErrorException {
     if (registrant.isPresent()) {
@@ -491,25 +447,6 @@ public class DomainFlowUtils {
     }
   }
 
-  /**
-   * Enforces the presence/absence of contact data on domain updates depending on the minimum data
-   * set migration schedule.
-   */
-  static void validateUpdateContactData(
-      Optional<VKey<Contact>> existingRegistrant,
-      Optional<VKey<Contact>> newRegistrant,
-      Set<DesignatedContact> existingContacts,
-      Set<DesignatedContact> newContacts)
-      throws ParameterValuePolicyErrorException {
-    // Throw if the update specifies a new registrant that is different from the existing one.
-    if (newRegistrant.isPresent() && !newRegistrant.equals(existingRegistrant)) {
-      throw new RegistrantProhibitedException();
-    }
-    // Throw if the update specifies any new contacts that weren't already present on the domain.
-    if (!Sets.difference(newContacts, existingContacts).isEmpty()) {
-      throw new ContactsProhibitedException();
-    }
-  }
 
   static void validateNameserversAllowedOnTld(String tld, Set<String> fullyQualifiedHostNames)
       throws EppException {
@@ -1032,12 +969,9 @@ public class DomainFlowUtils {
   /** Validate the contacts and nameservers specified in a domain create command. */
   static void validateCreateCommandContactsAndNameservers(
       Create command, Tld tld, InternetDomainName domainName) throws EppException {
-    verifyNotInPendingDelete(
-        command.getContacts(), command.getRegistrant(), command.getNameservers());
-    validateContactsHaveTypes(command.getContacts());
+    verifyNotInPendingDelete(command.getNameservers());
     String tldStr = tld.getTldStr();
-    validateNoDuplicateContacts(command.getContacts());
-    validateCreateContactData(command.getRegistrant(), command.getContacts());
+    enforceContactAbsencesOnCreate(command);
     ImmutableSet<String> hostNames = command.getNameserverHostNames();
     validateNameserversCountForTld(tldStr, domainName, hostNames.size());
     validateNameserversAllowedOnTld(tldStr, hostNames);
@@ -1143,17 +1077,6 @@ public class DomainFlowUtils {
         .build();
   }
 
-  static ImmutableSet<ForeignKeyedDesignatedContact> loadForeignKeyedDesignatedContacts(
-      ImmutableSet<DesignatedContact> contacts) {
-    ImmutableSet.Builder<ForeignKeyedDesignatedContact> builder = new ImmutableSet.Builder<>();
-    for (DesignatedContact contact : contacts) {
-      builder.add(
-          ForeignKeyedDesignatedContact.create(
-              contact.getType(), tm().loadByKey(contact.getContactKey()).getContactId()));
-    }
-    return builder.build();
-  }
-
   /**
    * Returns a set of DomainTransactionRecords which negate the most recent HistoryEntry's records.
    *
@@ -1293,32 +1216,6 @@ public class DomainFlowUtils {
     }
   }
 
-  /** Missing type attribute for contact. */
-  static class MissingContactTypeException extends ParameterValuePolicyErrorException {
-    public MissingContactTypeException() {
-      super("Missing type attribute for contact");
-    }
-  }
-
-  /** More than one contact for a given role is not allowed. */
-  static class DuplicateContactForRoleException extends ParameterValuePolicyErrorException {
-
-    public DuplicateContactForRoleException(Multimap<Type, String> dupeContactsByType) {
-      super(
-          String.format(
-              "More than one contact for a given role is not allowed: %s",
-              dupeContactsByType.asMap().entrySet().stream()
-                  .sorted(comparing(e -> e.getKey().name()))
-                  .map(
-                      e ->
-                          String.format(
-                              "role [%s] has contacts [%s]",
-                              Ascii.toLowerCase(e.getKey().name()),
-                              e.getValue().stream().sorted().collect(joining(", "))))
-                  .collect(joining(", "))));
-    }
-  }
-
   /** Declared launch extension phase does not match the current registry phase. */
   static class LaunchPhaseMismatchException extends ParameterValuePolicyErrorException {
     public LaunchPhaseMismatchException() {

core/src/main/java/google/registry/flows/domain/DomainInfoFlow.java

@@ -19,7 +19,6 @@ import static google.registry.flows.ResourceFlowUtils.loadAndVerifyExistence;
 import static google.registry.flows.ResourceFlowUtils.verifyOptionalAuthInfo;
 import static google.registry.flows.domain.DomainFlowUtils.addSecDnsExtensionIfPresent;
 import static google.registry.flows.domain.DomainFlowUtils.handleFeeRequest;
-import static google.registry.flows.domain.DomainFlowUtils.loadForeignKeyedDesignatedContacts;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 
 import com.google.common.collect.ImmutableList;
@@ -126,15 +125,11 @@ public final class DomainInfoFlow implements MutatingFlow {
             .setLastEppUpdateTime(domain.getLastEppUpdateTime())
             .setRegistrationExpirationTime(domain.getRegistrationExpirationTime())
             .setLastTransferTime(domain.getLastTransferTime());
-    domain
-        .getRegistrant()
-        .ifPresent(r -> infoBuilder.setRegistrant(tm().loadByKey(r).getContactId()));
 
     // If authInfo is non-null, then the caller is authorized to see the full information since we
     // will have already verified the authInfo is valid.
     if (registrarId.equals(domain.getCurrentSponsorRegistrarId()) || authInfo.isPresent()) {
       infoBuilder
-          .setContacts(loadForeignKeyedDesignatedContacts(domain.getContacts()))
           .setSubordinateHosts(
               hostsRequest.requestSubordinate() ? domain.getSubordinateHosts() : null)
           .setCreationRegistrarId(domain.getCreationRegistrarId())

core/src/main/java/google/registry/flows/domain/DomainUpdateFlow.java

@@ -29,14 +29,12 @@ import static google.registry.flows.ResourceFlowUtils.verifyOptionalAuthInfo;
 import static google.registry.flows.ResourceFlowUtils.verifyResourceOwnership;
 import static google.registry.flows.domain.DomainFlowUtils.checkAllowedAccessToTld;
 import static google.registry.flows.domain.DomainFlowUtils.cloneAndLinkReferences;
+import static google.registry.flows.domain.DomainFlowUtils.enforceContactAbsencesOnUpdate;
 import static google.registry.flows.domain.DomainFlowUtils.updateDsData;
-import static google.registry.flows.domain.DomainFlowUtils.validateContactsHaveTypes;
 import static google.registry.flows.domain.DomainFlowUtils.validateDsData;
 import static google.registry.flows.domain.DomainFlowUtils.validateFeesAckedIfPresent;
 import static google.registry.flows.domain.DomainFlowUtils.validateNameserversAllowedOnTld;
 import static google.registry.flows.domain.DomainFlowUtils.validateNameserversCountForTld;
-import static google.registry.flows.domain.DomainFlowUtils.validateNoDuplicateContacts;
-import static google.registry.flows.domain.DomainFlowUtils.validateUpdateContactData;
 import static google.registry.flows.domain.DomainFlowUtils.verifyClientUpdateNotProhibited;
 import static google.registry.flows.domain.DomainFlowUtils.verifyNotInPendingDelete;
 import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_UPDATE;
@@ -64,8 +62,6 @@ import google.registry.flows.domain.DomainFlowUtils.RegistrantProhibitedExceptio
 import google.registry.model.ImmutableObject;
 import google.registry.model.billing.BillingBase.Reason;
 import google.registry.model.billing.BillingEvent;
-import google.registry.model.contact.Contact;
-import google.registry.model.domain.DesignatedContact;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainCommand.Update;
 import google.registry.model.domain.DomainCommand.Update.AddRemove;
@@ -88,7 +84,6 @@ import google.registry.model.poll.PendingActionNotificationResponse.DomainPendin
 import google.registry.model.poll.PollMessage;
 import google.registry.model.reporting.IcannReportingTypes.ActivityReportField;
 import google.registry.model.tld.Tld;
-import google.registry.persistence.VKey;
 import jakarta.inject.Inject;
 import java.util.Objects;
 import java.util.Optional;
@@ -97,8 +92,8 @@ import org.joda.time.DateTime;
 /**
  * An EPP flow that updates a domain.
  *
- * <p>Updates can change contacts, nameservers and delegation signer data of a domain. Updates
- * cannot change the domain's name.
+ * <p>Updates can change nameservers and delegation signer data of a domain. Updates cannot change
+ * the domain's name.
  *
  * <p>Some status values (those of the form "serverSomethingProhibited") can only be applied by the
  * superuser. As such, adding or removing these statuses incurs a billing event. There will be only
@@ -113,7 +108,6 @@ import org.joda.time.DateTime;
  * @error {@link google.registry.flows.exceptions.OnlyToolCanPassMetadataException}
  * @error {@link google.registry.flows.exceptions.ResourceHasClientUpdateProhibitedException}
  * @error {@link google.registry.flows.exceptions.ResourceStatusProhibitsOperationException}
- * @error {@link DomainFlowUtils.DuplicateContactForRoleException}
  * @error {@link DomainFlowUtils.EmptySecDnsUpdateException}
  * @error {@link DomainFlowUtils.FeesMismatchException}
  * @error {@link DomainFlowUtils.FeesRequiredForNonFreeOperationException}
@@ -121,7 +115,6 @@ import org.joda.time.DateTime;
  * @error {@link DomainFlowUtils.LinkedResourcesDoNotExistException}
  * @error {@link DomainFlowUtils.LinkedResourceInPendingDeleteProhibitsOperationException}
  * @error {@link DomainFlowUtils.MaxSigLifeChangeNotSupportedException}
- * @error {@link DomainFlowUtils.MissingContactTypeException}
  * @error {@link DomainFlowUtils.NameserversNotAllowedForTldException}
  * @error {@link NameserversNotSpecifiedForTldWithNameserverAllowListException}
  * @error {@link DomainFlowUtils.NotAuthorizedForTldException}
@@ -158,7 +151,9 @@ public final class DomainUpdateFlow implements MutatingFlow {
   @Inject EppResponse.Builder responseBuilder;
   @Inject DomainUpdateFlowCustomLogic flowCustomLogic;
   @Inject DomainPricingLogic pricingLogic;
-  @Inject DomainUpdateFlow() {}
+
+  @Inject
+  DomainUpdateFlow() {}
 
   @Override
   public EppResponse run() throws EppException {
@@ -179,7 +174,7 @@ public final class DomainUpdateFlow implements MutatingFlow {
     Domain newDomain = performUpdate(command, existingDomain, now);
     DomainHistory domainHistory =
         historyBuilder.setType(DOMAIN_UPDATE).setDomain(newDomain).build();
-    validateNewState(existingDomain, newDomain);
+    validateNewState(newDomain);
     if (requiresDnsUpdate(existingDomain, newDomain)) {
       requestDomainDnsRefresh(targetId);
     }
@@ -235,12 +230,7 @@ public final class DomainUpdateFlow implements MutatingFlow {
         eppInput.getSingleExtension(FeeUpdateCommandExtension.class);
     FeesAndCredits feesAndCredits = pricingLogic.getUpdatePrice(tld, targetId, now);
     validateFeesAckedIfPresent(feeUpdate, feesAndCredits, false);
-    verifyNotInPendingDelete(
-        add.getContacts(),
-        command.getInnerChange().getRegistrant(),
-        add.getNameservers());
-    validateContactsHaveTypes(add.getContacts());
-    validateContactsHaveTypes(remove.getContacts());
+    verifyNotInPendingDelete(add.getNameservers());
     validateNameserversAllowedOnTld(tldStr, add.getNameserverHostNames());
   }
 
@@ -250,7 +240,6 @@ public final class DomainUpdateFlow implements MutatingFlow {
     Optional<SecDnsUpdateExtension> secDnsUpdate =
         eppInput.getSingleExtension(SecDnsUpdateExtension.class);
     verifyAddsAndRemoves(domain.getNameservers(), add.getNameservers(), remove.getNameservers());
-    verifyAddsAndRemoves(domain.getContacts(), add.getContacts(), remove.getContacts());
     verifyAddsAndRemoves(domain.getStatusValues(), add.getStatusValues(), remove.getStatusValues());
     if (secDnsUpdate.isPresent()) {
       SecDnsUpdateExtension ext = secDnsUpdate.get();
@@ -260,12 +249,7 @@ public final class DomainUpdateFlow implements MutatingFlow {
           ext.getRemove().map(Remove::getDsData).orElse(ImmutableSet.of()));
     }
     Change change = command.getInnerChange();
-
-    // We have to verify no duplicate contacts _before_ constructing the domain because it is
-    // illegal to construct a domain with duplicate contacts.
-    Sets.SetView<DesignatedContact> newContacts =
-        union(Sets.difference(domain.getContacts(), remove.getContacts()), add.getContacts());
-    validateNoDuplicateContacts(newContacts);
+    enforceContactAbsencesOnUpdate(command);
 
     Domain.Builder domainBuilder =
         domain
@@ -285,9 +269,6 @@ public final class DomainUpdateFlow implements MutatingFlow {
             .setLastEppUpdateRegistrarId(registrarId)
             .addStatusValues(add.getStatusValues())
             .removeStatusValues(remove.getStatusValues())
-            .removeContacts(remove.getContacts())
-            .addContacts(add.getContacts())
-            .setRegistrant(determineUpdatedRegistrant(change, domain))
             .setAuthInfo(Optional.ofNullable(change.getAuthInfo()).orElse(domain.getAuthInfo()));
 
     if (!add.getNameservers().isEmpty()) {
@@ -309,15 +290,6 @@ public final class DomainUpdateFlow implements MutatingFlow {
     return domainBuilder.build();
   }
 
-  private Optional<VKey<Contact>> determineUpdatedRegistrant(Change change, Domain domain) {
-    // During or after the minimum dataset transition, allow registrant to be removed.
-    if (change.getRegistrantContactId().isPresent()
-        && change.getRegistrantContactId().get().isEmpty()) {
-      return Optional.empty();
-    }
-    return change.getRegistrant().or(domain::getRegistrant);
-  }
-
   /**
    * Checks whether the new state of the domain is valid.
    *
@@ -325,13 +297,7 @@ public final class DomainUpdateFlow implements MutatingFlow {
    * compliant with the additions or amendments, otherwise existing data can become invalid and
    * cause Domain update failure.
    */
-  private static void validateNewState(Domain existingDomain, Domain newDomain)
-      throws EppException {
-    validateUpdateContactData(
-        existingDomain.getRegistrant(),
-        newDomain.getRegistrant(),
-        existingDomain.getContacts(),
-        newDomain.getContacts());
+  private static void validateNewState(Domain newDomain) throws EppException {
     validateDsData(newDomain.getDsData());
     validateNameserversCountForTld(
         newDomain.getTld(),
@@ -345,8 +311,8 @@ public final class DomainUpdateFlow implements MutatingFlow {
     Optional<MetadataExtension> metadataExtension =
         eppInput.getSingleExtension(MetadataExtension.class);
     if (metadataExtension.isPresent() && metadataExtension.get().getRequestedByRegistrar()) {
-      for (StatusValue statusValue
-          : symmetricDifference(existingDomain.getStatusValues(), newDomain.getStatusValues())) {
+      for (StatusValue statusValue :
+          symmetricDifference(existingDomain.getStatusValues(), newDomain.getStatusValues())) {
         if (statusValue.isChargedStatus()) {
           // Only charge once.
           return Optional.of(

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/model/poll/PollMessage.java

@@ -27,7 +27,6 @@ import google.registry.model.UnsafeSerializable;
 import google.registry.model.annotations.ExternalMessagingName;
 import google.registry.model.annotations.IdAllocation;
 import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.DomainRenewData;
@@ -272,12 +271,6 @@ public abstract class PollMessage extends ImmutableObject
       return thisCastToDerived();
     }
 
-    public B setContactHistoryId(HistoryEntryId historyId) {
-      getInstance().contactRepoId = historyId.getRepoId();
-      getInstance().contactHistoryRevisionId = historyId.getRevisionId();
-      return thisCastToDerived();
-    }
-
     public B setHostHistoryId(HistoryEntryId historyId) {
       getInstance().hostRepoId = historyId.getRepoId();
       getInstance().hostHistoryRevisionId = historyId.getRevisionId();
@@ -290,9 +283,6 @@ public abstract class PollMessage extends ImmutableObject
       if (history instanceof DomainHistory) {
         return setDomainHistoryId(historyId);
       }
-      if (history instanceof ContactHistory) {
-        return setContactHistoryId(historyId);
-      }
       if (history instanceof HostHistory) {
         return setHostHistoryId(historyId);
       }

core/src/main/java/google/registry/model/reporting/HistoryEntry.java

@@ -23,8 +23,6 @@ import google.registry.model.EppResource;
 import google.registry.model.ImmutableObject;
 import google.registry.model.UnsafeSerializable;
 import google.registry.model.annotations.IdAllocation;
-import google.registry.model.contact.ContactBase;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.eppcommon.Trid;
@@ -348,8 +346,6 @@ public abstract class HistoryEntry extends ImmutableObject
       HistoryEntry.Builder<? extends HistoryEntry, ?> createBuilderForResource(E parent) {
     if (parent instanceof DomainBase) {
       return new DomainHistory.Builder().setDomain((DomainBase) parent);
-    } else if (parent instanceof ContactBase) {
-      return new ContactHistory.Builder().setContact((ContactBase) parent);
     } else if (parent instanceof HostBase) {
       return new HostHistory.Builder().setHost((HostBase) parent);
     } else {

core/src/main/java/google/registry/model/reporting/HistoryEntryDao.java

@@ -25,8 +25,6 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Streams;
 import google.registry.model.EppResource;
-import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.host.Host;
@@ -46,8 +44,6 @@ public class HistoryEntryDao {
   public static ImmutableMap<Class<? extends EppResource>, Class<? extends HistoryEntry>>
       RESOURCE_TYPES_TO_HISTORY_TYPES =
           ImmutableMap.of(
-              Contact.class,
-              ContactHistory.class,
               Domain.class,
               DomainHistory.class,
               Host.class,
@@ -59,7 +55,6 @@ public class HistoryEntryDao {
     return tm().transact(
             () ->
                 new ImmutableList.Builder<HistoryEntry>()
-                    .addAll(loadAllHistoryObjects(ContactHistory.class, afterTime, beforeTime))
                     .addAll(loadAllHistoryObjects(DomainHistory.class, afterTime, beforeTime))
                     .addAll(loadAllHistoryObjects(HostHistory.class, afterTime, beforeTime))
                     .build());
@@ -121,7 +116,6 @@ public class HistoryEntryDao {
     return tm().reTransact(
             () ->
                 Streams.concat(
-                        loadHistoryObjectByRegistrarsInternal(ContactHistory.class, registrarIds),
                         loadHistoryObjectByRegistrarsInternal(DomainHistory.class, registrarIds),
                         loadHistoryObjectByRegistrarsInternal(HostHistory.class, registrarIds))
                     .sorted(Comparator.comparing(HistoryEntry::getModificationTime))

core/src/main/java/google/registry/module/RequestComponent.java

@@ -24,11 +24,9 @@ import google.registry.batch.DeleteLoadTestDataAction;
 import google.registry.batch.DeleteProberDataAction;
 import google.registry.batch.ExpandBillingRecurrencesAction;
 import google.registry.batch.RelockDomainAction;
-import google.registry.batch.RemoveAllDomainContactsAction;
 import google.registry.batch.ResaveAllEppResourcesPipelineAction;
 import google.registry.batch.ResaveEntityAction;
 import google.registry.batch.SendExpiringCertificateNotificationEmailAction;
-import google.registry.batch.WipeOutContactHistoryPiiAction;
 import google.registry.bsa.BsaDownloadAction;
 import google.registry.bsa.BsaRefreshAction;
 import google.registry.bsa.BsaValidateAction;
@@ -276,8 +274,6 @@ interface RequestComponent {
 
   ReadinessProbeActionFrontend readinessProbeActionFrontend();
 
-  RemoveAllDomainContactsAction removeAllDomainContactsAction();
-
   RdapAutnumAction rdapAutnumAction();
 
   RdapDomainAction rdapDomainAction();
@@ -350,8 +346,6 @@ interface RequestComponent {
 
   VerifyOteAction verifyOteAction();
 
-  WipeOutContactHistoryPiiAction wipeOutContactHistoryPiiAction();
-
   @Subcomponent.Builder
   abstract class Builder implements RequestComponentBuilder<RequestComponent> {
     @Override

core/src/main/java/google/registry/mosapi/MosApiMetrics.java

@@ -14,21 +14,346 @@
 
 package google.registry.mosapi;
 
+import static com.google.common.collect.ImmutableList.toImmutableList;
+
+import com.google.api.client.googleapis.json.GoogleJsonResponseException;
+import com.google.api.services.monitoring.v3.Monitoring;
+import com.google.api.services.monitoring.v3.model.CreateTimeSeriesRequest;
+import com.google.api.services.monitoring.v3.model.LabelDescriptor;
+import com.google.api.services.monitoring.v3.model.Metric;
+import com.google.api.services.monitoring.v3.model.MetricDescriptor;
+import com.google.api.services.monitoring.v3.model.MonitoredResource;
+import com.google.api.services.monitoring.v3.model.Point;
+import com.google.api.services.monitoring.v3.model.TimeInterval;
+import com.google.api.services.monitoring.v3.model.TimeSeries;
+import com.google.api.services.monitoring.v3.model.TypedValue;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Ascii;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterators;
 import com.google.common.flogger.FluentLogger;
+import google.registry.config.RegistryConfig.Config;
+import google.registry.mosapi.MosApiModels.ServiceStatus;
 import google.registry.mosapi.MosApiModels.TldServiceState;
+import google.registry.request.lock.LockHandler;
+import google.registry.util.Clock;
 import jakarta.inject.Inject;
+import java.io.IOException;
+import java.time.Instant;
+import java.util.Iterator;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Stream;
+import org.joda.time.Duration;
 
 /** Metrics Exporter for MoSAPI. */
 public class MosApiMetrics {
 
   private static final FluentLogger logger = FluentLogger.forEnclosingClass();
 
-  @Inject
-  public MosApiMetrics() {}
+  // Google Cloud Monitoring Limit: Max 200 TimeSeries per request
+  private static final int MAX_TIMESERIES_PER_REQUEST = 195;
 
-  public void recordStates(List<TldServiceState> states) {
-    // b/467541269: Logic to push status to Cloud Monitoring goes here
-    logger.atInfo().log("MoSAPI record metrics logic will be implemented from here");
+  private static final int METRICS_ALREADY_EXIST = 409;
+
+  // Magic String Constants
+  private static final String METRIC_DOMAIN = "custom.googleapis.com/mosapi/";
+  private static final String PROJECT_RESOURCE_PREFIX = "projects/";
+  private static final String RESOURCE_TYPE_GLOBAL = "global";
+  private static final String LABEL_PROJECT_ID = "project_id";
+  private static final String LABEL_TLD = "tld";
+  private static final String LABEL_SERVICE_TYPE = "service_type";
+
+  // Lock Constants
+  private static final String LOCK_NAME = "MosApiMetricCreation";
+  private static final Duration LOCK_LEASE_TIME = Duration.standardHours(1);
+  // Metric Names
+  private static final String METRIC_TLD_STATUS = "tld_status";
+  private static final String METRIC_SERVICE_STATUS = "service_status";
+  private static final String METRIC_EMERGENCY_USAGE = "emergency_usage";
+  private static final String GAUGE_METRIC_KIND = "GAUGE";
+
+  // Metric Display Names & Descriptions
+  private static final String DISPLAY_NAME_TLD_STATUS =
+      "Health of TLDs. 1 = UP, 0 = DOWN,  2= DISABLED/NOT_MONITORED";
+  private static final String DESC_TLD_STATUS = "Overall Health of TLDs reported from ICANN";
+
+  private static final String DISPLAY_NAME_SERVICE_STATUS =
+      "Health of Services. 1 = UP, 0 = DOWN,  2= DISABLED/NOT_MONITORED";
+  private static final String DESC_SERVICE_STATUS =
+      "Overall Health of Services reported from ICANN";
+
+  private static final String DISPLAY_NAME_EMERGENCY_USAGE =
+      "Percentage of Emergency Threshold Consumed";
+  private static final String DESC_EMERGENCY_USAGE =
+      "Downtime threshold that if reached by any of the monitored Services may cause the TLDs"
+          + " Services emergency transition to an interim Registry Operator";
+
+  // MoSAPI Status Constants
+  private static final String STATUS_UP_INCONCLUSIVE = "UP-INCONCLUSIVE";
+  private static final String STATUS_DOWN = "DOWN";
+  private static final String STATUS_DISABLED = "DISABLED";
+
+  private final Monitoring monitoringClient;
+  private final String projectId;
+  private final String projectName;
+  private final Clock clock;
+  private final MonitoredResource monitoredResource;
+  private final LockHandler lockHandler;
+  // Flag to ensure we only create descriptors once, lazily
+  @VisibleForTesting static final AtomicBoolean isDescriptorInitialized = new AtomicBoolean(false);
+
+  @Inject
+  public MosApiMetrics(
+      Monitoring monitoringClient,
+      @Config("projectId") String projectId,
+      Clock clock,
+      LockHandler lockHandler) {
+    this.monitoringClient = monitoringClient;
+    this.projectId = projectId;
+    this.clock = clock;
+    this.projectName = PROJECT_RESOURCE_PREFIX + projectId;
+    this.lockHandler = lockHandler;
+    this.monitoredResource =
+        new MonitoredResource()
+            .setType(RESOURCE_TYPE_GLOBAL)
+            .setLabels(ImmutableMap.of(LABEL_PROJECT_ID, projectId));
+  }
+
+  /** Accepts a list of states and processes them in a single async batch task. */
+  public void recordStates(ImmutableList<TldServiceState> states) {
+    // If this is the first time we are recording, ensure descriptors exist.
+    ensureMetricDescriptorsWithLock();
+    pushBatchMetrics(states);
+  }
+
+  /**
+   * Attempts to create metric descriptors using a distributed lock.
+   *
+   * <p>If the lock is acquired, this instance creates the descriptors and marks itself initialized.
+   * If the lock is busy, it implies another instance is handling it, so we skip and proceed.
+   */
+  private void ensureMetricDescriptorsWithLock() {
+    lockHandler.executeWithLocks(
+        () -> {
+          if (!isDescriptorInitialized.get()) {
+            createCustomMetricDescriptors();
+            isDescriptorInitialized.set(true);
+          }
+          return null;
+        },
+        null,
+        LOCK_LEASE_TIME,
+        LOCK_NAME);
+  }
+
+  // Defines the custom metrics in Cloud Monitoring
+  private void createCustomMetricDescriptors() {
+    // 1. TLD Status Descriptor
+    createMetricDescriptor(
+        METRIC_TLD_STATUS,
+        DISPLAY_NAME_TLD_STATUS,
+        DESC_TLD_STATUS,
+        "INT64",
+        ImmutableList.of(LABEL_TLD));
+
+    // 2. Service Status Descriptor
+    createMetricDescriptor(
+        METRIC_SERVICE_STATUS,
+        DISPLAY_NAME_SERVICE_STATUS,
+        DESC_SERVICE_STATUS,
+        "INT64",
+        ImmutableList.of(LABEL_TLD, LABEL_SERVICE_TYPE));
+
+    // 3. Emergency Usage Descriptor
+    createMetricDescriptor(
+        METRIC_EMERGENCY_USAGE,
+        DISPLAY_NAME_EMERGENCY_USAGE,
+        DESC_EMERGENCY_USAGE,
+        "DOUBLE",
+        ImmutableList.of(LABEL_TLD, LABEL_SERVICE_TYPE));
+
+    logger.atInfo().log("Metric descriptors ensured for project %s", projectId);
+  }
+
+  private void createMetricDescriptor(
+      String metricTypeSuffix,
+      String displayName,
+      String description,
+      String valueType,
+      ImmutableList<String> labelKeys) {
+
+    ImmutableList<LabelDescriptor> labelDescriptors =
+        labelKeys.stream()
+            .map(
+                key ->
+                    new LabelDescriptor()
+                        .setKey(key)
+                        .setValueType("STRING")
+                        .setDescription(
+                            key.equals(LABEL_TLD)
+                                ? "The TLD being monitored"
+                                : "The type of service"))
+            .collect(toImmutableList());
+
+    MetricDescriptor descriptor =
+        new MetricDescriptor()
+            .setType(METRIC_DOMAIN + metricTypeSuffix)
+            .setMetricKind(GAUGE_METRIC_KIND)
+            .setValueType(valueType)
+            .setDisplayName(displayName)
+            .setDescription(description)
+            .setLabels(labelDescriptors);
+    try {
+      monitoringClient
+          .projects()
+          .metricDescriptors()
+          .create(this.projectName, descriptor)
+          .execute();
+    } catch (GoogleJsonResponseException e) {
+      if (e.getStatusCode() == METRICS_ALREADY_EXIST) {
+        // the metric already exists. This is expected.
+        logger.atFine().log("Metric descriptor %s already exists.", metricTypeSuffix);
+      } else {
+        logger.atWarning().withCause(e).log(
+            "Failed to create metric descriptor %s. Status: %d",
+            metricTypeSuffix, e.getStatusCode());
+      }
+    } catch (Exception e) {
+      logger.atWarning().withCause(e).log(
+          "Unexpected error creating metric descriptor %s.", metricTypeSuffix);
+    }
+  }
+
+  private void pushBatchMetrics(ImmutableList<TldServiceState> states) {
+    Instant now = Instant.ofEpochMilli(clock.nowUtc().getMillis());
+    TimeInterval interval = new TimeInterval().setEndTime(now.toString());
+    Stream<TimeSeries> allTimeSeriesStream =
+        states.stream().flatMap(state -> createMetricsForState(state, interval));
+
+    Iterator<List<TimeSeries>> batchIterator =
+        Iterators.partition(allTimeSeriesStream.iterator(), MAX_TIMESERIES_PER_REQUEST);
+
+    int successCount = 0;
+    int failureCount = 0;
+
+    // Iterate and count
+    while (batchIterator.hasNext()) {
+      List<TimeSeries> batch = batchIterator.next();
+      try {
+        CreateTimeSeriesRequest request = new CreateTimeSeriesRequest().setTimeSeries(batch);
+        monitoringClient.projects().timeSeries().create(this.projectName, request).execute();
+
+        successCount++;
+
+      } catch (IOException e) {
+        failureCount++;
+        // Log individual batch failures, so we have the stack trace for debugging
+        logger.atWarning().withCause(e).log(
+            "Failed to push batch of %d time series.", batch.size());
+      }
+    }
+
+    // 4. Log the final summary
+    if (failureCount > 0) {
+      logger.atWarning().log(
+          "Metric push finished with errors. Batches Succeeded: %d, Failed: %d",
+          successCount, failureCount);
+    } else {
+      logger.atInfo().log("Metric push finished successfully. Batches Succeeded: %d", successCount);
+    }
+  }
+
+  /** Generates all TimeSeries (TLD + Services) for a single state object. */
+  private Stream<TimeSeries> createMetricsForState(TldServiceState state, TimeInterval interval) {
+    // 1. TLD Status
+    Stream<TimeSeries> tldStream = Stream.of(createTldStatusTimeSeries(state, interval));
+
+    // 2. Service Metrics (if any)
+    Stream<TimeSeries> serviceStream =
+        state.serviceStatuses().entrySet().stream()
+            .flatMap(
+                entry ->
+                    createServiceMetricsStream(
+                        state.tld(), entry.getKey(), entry.getValue(), interval));
+
+    return Stream.concat(tldStream, serviceStream);
+  }
+
+  private Stream<TimeSeries> createServiceMetricsStream(
+      String tld, String serviceType, ServiceStatus statusObj, TimeInterval interval) {
+    ImmutableMap<String, String> labels =
+        ImmutableMap.of(LABEL_TLD, tld, LABEL_SERVICE_TYPE, serviceType);
+
+    return Stream.of(
+        createTimeSeries(
+            METRIC_SERVICE_STATUS, labels, parseServiceStatus(statusObj.status()), interval),
+        createTimeSeries(METRIC_EMERGENCY_USAGE, labels, statusObj.emergencyThreshold(), interval));
+  }
+
+  private TimeSeries createTldStatusTimeSeries(TldServiceState state, TimeInterval interval) {
+    return createTimeSeries(
+        METRIC_TLD_STATUS,
+        ImmutableMap.of(LABEL_TLD, state.tld()),
+        parseTldStatus(state.status()),
+        interval);
+  }
+
+  private TimeSeries createTimeSeries(
+      String suffix, ImmutableMap<String, String> labels, Number val, TimeInterval interval) {
+    Metric metric = new Metric().setType(METRIC_DOMAIN + suffix).setLabels(labels);
+
+    TypedValue tv = new TypedValue();
+    if (val instanceof Double) {
+      tv.setDoubleValue((Double) val);
+    } else {
+      tv.setInt64Value(val.longValue());
+    }
+
+    return new TimeSeries()
+        .setMetric(metric)
+        .setResource(this.monitoredResource)
+        .setPoints(ImmutableList.of(new Point().setInterval(interval).setValue(tv)));
+  }
+
+  /**
+   * Translates MoSAPI status to a numeric metric.
+   *
+   * <p>Mappings: 1 (UP) = Healthy; 0 (DOWN) = Critical failure; 2 (UP-INCONCLUSIVE) = Disabled/Not
+   * Monitored/In Maintenance.
+   *
+   * <p>A status of 2 indicates the SLA monitoring system is under maintenance. The TLD is
+   * considered "UP" by default, but individual service checks are disabled. This distinguishes
+   * maintenance windows from actual availability or outages.
+   *
+   * @see <a href="https://www.icann.org/mosapi-specification.pdf">ICANN MoSAPI Spec Sec 5.1</a>
+   */
+  private long parseTldStatus(String status) {
+    return switch (Ascii.toUpperCase(status)) {
+      case STATUS_DOWN -> 0;
+      case STATUS_UP_INCONCLUSIVE -> 2;
+      default -> 1; // status is up
+    };
+  }
+
+  /**
+   * Translates MoSAPI service status to a numeric metric.
+   *
+   * <p>Mappings: 1 (UP) = Healthy; 0 (DOWN) = Critical failure; 2 (DISABLED/UP-INCONCLUSIVE*) =
+   * Disabled/Not Monitored/In Maintenance.
+   *
+   * @see <a href="https://www.icann.org/mosapi-specification.pdf">ICANN MoSAPI Spec Sec 5.1</a>
+   */
+  private long parseServiceStatus(String status) {
+    String serviceStatus = Ascii.toUpperCase(status);
+    if (serviceStatus.startsWith(STATUS_UP_INCONCLUSIVE)) {
+      return 2;
+    }
+    return switch (serviceStatus) {
+      case STATUS_DOWN -> 0;
+      case STATUS_DISABLED -> 2;
+      default -> 1; // status is Up
+    };
   }
 }

core/src/main/java/google/registry/mosapi/MosApiStateService.java

@@ -26,11 +26,9 @@ import google.registry.mosapi.MosApiModels.ServiceStatus;
 import google.registry.mosapi.MosApiModels.TldServiceState;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
-import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
-import java.util.stream.Collectors;
 
 /** A service that provides business logic for interacting with MoSAPI Service State. */
 public class MosApiStateService {
@@ -135,11 +133,12 @@ public class MosApiStateService {
                         tldExecutor))
             .collect(toImmutableList());
 
-    List<TldServiceState> allStates =
+    ImmutableList<TldServiceState> allStates =
         futures.stream()
             .map(CompletableFuture::join)
             .filter(Objects::nonNull)
-            .collect(Collectors.toList());
+            .filter(this::isValidForMetrics)
+            .collect(toImmutableList());
 
     if (!allStates.isEmpty()) {
       try {
@@ -152,4 +151,14 @@ public class MosApiStateService {
       logger.atWarning().log("No successful TLD states fetched; skipping metrics push.");
     }
   }
+
+  private boolean isValidForMetrics(TldServiceState state) {
+    if (state.tld() == null || state.status() == null) {
+      logger.atSevere().log(
+          "Contract Violation: Received invalid state (TLD=%s, Status=%s). Skipping.",
+          state.tld(), state.status());
+      return false;
+    }
+    return true;
+  }
 }

core/src/main/java/google/registry/mosapi/module/MosApiModule.java

@@ -200,7 +200,7 @@ public final class MosApiModule {
   @Singleton
   @Named("mosapiTldExecutor")
   static ExecutorService provideMosapiTldExecutor(
-      @Config("mosapiTldThreadCnt") int threadPoolSize) {
+      @Config("mosapiTldThreadCount") int threadPoolSize) {
     return Executors.newFixedThreadPool(threadPoolSize);
   }
 }

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/beam/wipe_out_contact_history_pii_pipeline_metadata.json

@@ -1,39 +0,0 @@
-{
-  "name": "Wipe Out PII From Old Contact History Entries",
-  "description": "An Apache Beam batch pipeline that finds old contact history entries and remove PII information from them.",
-  "parameters": [
-    {
-      "name": "registryEnvironment",
-      "label": "The Registry environment.",
-      "helpText": "The Registry environment.",
-      "is_optional": false,
-      "regexes": [
-        "^PRODUCTION|SANDBOX|CRASH|QA|ALPHA$"
-      ]
-    },
-    {
-      "name": "isolationOverride",
-      "label": "The desired SQL transaction isolation level.",
-      "helpText": "The desired SQL transaction isolation level.",
-      "is_optional": true,
-      "regexes": [
-        "^[0-9A-Z_]+$"
-      ]
-    },
-    {
-      "name": "cutoffTime",
-      "label": "The maximum history modification time of a contact history entry eligible for wipe out.",
-      "helpText": "If the history modificaiton time of contact history entry is older than this, and it is not the most recent entry of a contact, it will have its PII wiped out.",
-      "is_optional": true
-    },
-    {
-      "name": "isDryRun",
-      "label": "Whether this job is a dry run.",
-      "helpText": "If true, no changes will be saved to the database.",
-      "is_optional": true,
-      "regexes": [
-        "^true|false$"
-      ]
-    }
-  ]
-}

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/batch/RemoveAllDomainContactsActionTest.java

@@ -1,119 +0,0 @@
-// Copyright 2025 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.batch;
-
-import static com.google.common.truth.Truth.assertThat;
-import static google.registry.model.common.FeatureFlag.FeatureName.MINIMUM_DATASET_CONTACTS_PROHIBITED;
-import static google.registry.model.common.FeatureFlag.FeatureStatus.ACTIVE;
-import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.loadByEntity;
-import static google.registry.testing.DatabaseHelper.newDomain;
-import static google.registry.testing.DatabaseHelper.persistActiveContact;
-import static google.registry.testing.DatabaseHelper.persistResource;
-import static google.registry.util.DateTimeUtils.START_OF_TIME;
-import static org.mockito.Mockito.mock;
-
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.util.concurrent.RateLimiter;
-import google.registry.flows.DaggerEppTestComponent;
-import google.registry.flows.EppController;
-import google.registry.flows.EppTestComponent.FakesAndMocksModule;
-import google.registry.model.common.FeatureFlag;
-import google.registry.model.contact.Contact;
-import google.registry.model.domain.Domain;
-import google.registry.persistence.transaction.JpaTestExtensions;
-import google.registry.persistence.transaction.JpaTestExtensions.JpaIntegrationTestExtension;
-import google.registry.testing.FakeClock;
-import google.registry.testing.FakeLockHandler;
-import google.registry.testing.FakeResponse;
-import java.util.Optional;
-import org.joda.time.DateTime;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-/** Unit tests for {@link RemoveAllDomainContactsAction}. */
-class RemoveAllDomainContactsActionTest {
-
-  @RegisterExtension
-  final JpaIntegrationTestExtension jpa =
-      new JpaTestExtensions.Builder().buildIntegrationTestExtension();
-
-  private final FakeResponse response = new FakeResponse();
-  private final RateLimiter rateLimiter = mock(RateLimiter.class);
-  private RemoveAllDomainContactsAction action;
-
-  @BeforeEach
-  void beforeEach() {
-    createTld("tld");
-    persistResource(
-        new FeatureFlag.Builder()
-            .setFeatureName(MINIMUM_DATASET_CONTACTS_PROHIBITED)
-            .setStatusMap(ImmutableSortedMap.of(START_OF_TIME, ACTIVE))
-            .build());
-    EppController eppController =
-        DaggerEppTestComponent.builder()
-            .fakesAndMocksModule(FakesAndMocksModule.create(new FakeClock()))
-            .build()
-            .startRequest()
-            .eppController();
-    action =
-        new RemoveAllDomainContactsAction(
-            eppController, "NewRegistrar", new FakeLockHandler(true), rateLimiter, response);
-  }
-
-  @Test
-  void test_removesAllContactsFromMultipleDomains_andDoesntModifyDomainThatHasNoContacts() {
-    Contact c1 = persistActiveContact("contact12345");
-    Domain d1 = persistResource(newDomain("foo.tld", c1));
-    assertThat(d1.getAllContacts()).hasSize(3);
-    Contact c2 = persistActiveContact("contact23456");
-    Domain d2 = persistResource(newDomain("bar.tld", c2));
-    assertThat(d2.getAllContacts()).hasSize(3);
-    Domain d3 =
-        persistResource(
-            newDomain("baz.tld")
-                .asBuilder()
-                .setRegistrant(Optional.empty())
-                .setContacts(ImmutableSet.of())
-                .build());
-    assertThat(d3.getAllContacts()).isEmpty();
-    DateTime lastUpdate = d3.getUpdateTimestamp().getTimestamp();
-
-    action.run();
-    assertThat(loadByEntity(d1).getAllContacts()).isEmpty();
-    assertThat(loadByEntity(d2).getAllContacts()).isEmpty();
-    assertThat(loadByEntity(d3).getUpdateTimestamp().getTimestamp()).isEqualTo(lastUpdate);
-  }
-
-  @Test
-  void test_removesContacts_onDomainsThatOnlyPartiallyHaveContacts() {
-    Contact c1 = persistActiveContact("contact12345");
-    Domain d1 =
-        persistResource(
-            newDomain("foo.tld", c1).asBuilder().setContacts(ImmutableSet.of()).build());
-    assertThat(d1.getAllContacts()).hasSize(1);
-    Contact c2 = persistActiveContact("contact23456");
-    Domain d2 =
-        persistResource(
-            newDomain("bar.tld", c2).asBuilder().setRegistrant(Optional.empty()).build());
-    assertThat(d2.getAllContacts()).hasSize(2);
-
-    action.run();
-    assertThat(loadByEntity(d1).getAllContacts()).isEmpty();
-    assertThat(loadByEntity(d2).getAllContacts()).isEmpty();
-  }
-}

core/src/test/java/google/registry/batch/WipeOutContactHistoryPiiActionTest.java

@@ -1,133 +0,0 @@
-// Copyright 2021 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.batch;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.google.api.services.dataflow.model.LaunchFlexTemplateRequest;
-import google.registry.beam.BeamActionTestBase;
-import google.registry.testing.FakeClock;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-import org.joda.time.DateTime;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-
-/** Unit tests for {@link WipeOutContactHistoryPiiAction}. */
-class WipeOutContactHistoryPiiActionTest extends BeamActionTestBase {
-
-  private final DateTime now = DateTime.parse("2019-01-19T01:02:03Z");
-  private final FakeClock clock = new FakeClock(now);
-  private final Map<String, String> expectedParameters = new HashMap<>();
-  private final ArgumentCaptor<LaunchFlexTemplateRequest> launchRequest =
-      ArgumentCaptor.forClass(LaunchFlexTemplateRequest.class);
-  private WipeOutContactHistoryPiiAction action =
-      new WipeOutContactHistoryPiiAction(
-          clock,
-          false,
-          Optional.empty(),
-          8,
-          "tucketBucket",
-          "testProject",
-          "testRegion",
-          dataflow,
-          response);
-
-  @BeforeEach
-  void before() {
-    expectedParameters.put("registryEnvironment", "UNITTEST");
-    expectedParameters.put("isDryRun", "false");
-    expectedParameters.put("cutoffTime", "2018-05-19T01:02:03.000Z");
-  }
-
-  @Test
-  void testSuccess() throws Exception {
-    action.run();
-    assertThat(response.getStatus()).isEqualTo(200);
-    assertThat(response.getPayload())
-        .isEqualTo("Launched contact history PII wipeout pipeline: jobid");
-    verify(templates, times(1))
-        .launch(eq("testProject"), eq("testRegion"), launchRequest.capture());
-    assertThat(launchRequest.getValue().getLaunchParameter().getParameters())
-        .containsExactlyEntriesIn(expectedParameters);
-  }
-
-  @Test
-  void testSuccess_providedCutoffTime() throws Exception {
-    action =
-        new WipeOutContactHistoryPiiAction(
-            clock,
-            false,
-            Optional.of(now.minusYears(1)),
-            8,
-            "tucketBucket",
-            "testProject",
-            "testRegion",
-            dataflow,
-            response);
-    action.run();
-    expectedParameters.put("cutoffTime", "2018-01-19T01:02:03.000Z");
-    assertThat(response.getStatus()).isEqualTo(200);
-    assertThat(response.getPayload())
-        .isEqualTo("Launched contact history PII wipeout pipeline: jobid");
-    verify(templates, times(1))
-        .launch(eq("testProject"), eq("testRegion"), launchRequest.capture());
-    assertThat(launchRequest.getValue().getLaunchParameter().getParameters())
-        .containsExactlyEntriesIn(expectedParameters);
-  }
-
-  @Test
-  void testSuccess_dryRun() throws Exception {
-    action =
-        new WipeOutContactHistoryPiiAction(
-            clock,
-            true,
-            Optional.empty(),
-            8,
-            "tucketBucket",
-            "testProject",
-            "testRegion",
-            dataflow,
-            response);
-    action.run();
-    expectedParameters.put("isDryRun", "true");
-    assertThat(response.getStatus()).isEqualTo(200);
-    assertThat(response.getPayload())
-        .isEqualTo("Launched contact history PII wipeout pipeline: jobid");
-    verify(templates, times(1))
-        .launch(eq("testProject"), eq("testRegion"), launchRequest.capture());
-    assertThat(launchRequest.getValue().getLaunchParameter().getParameters())
-        .containsExactlyEntriesIn(expectedParameters);
-  }
-
-  @Test
-  void testFailure_launchError() throws Exception {
-    when(launch.execute()).thenThrow(new IOException("cannot launch"));
-    action.run();
-    assertThat(response.getStatus()).isEqualTo(500);
-    assertThat(response.getPayload()).isEqualTo("Pipeline launch failed: cannot launch");
-    verify(templates, times(1))
-        .launch(eq("testProject"), eq("testRegion"), launchRequest.capture());
-    assertThat(launchRequest.getValue().getLaunchParameter().getParameters())
-        .containsExactlyEntriesIn(expectedParameters);
-  }
-}

core/src/test/java/google/registry/beam/resave/ResaveAllEppResourcesPipelineTest.java

@@ -22,7 +22,6 @@ import static google.registry.testing.DatabaseHelper.loadAllOf;
 import static google.registry.testing.DatabaseHelper.loadByEntity;
 import static google.registry.testing.DatabaseHelper.persistActiveContact;
 import static google.registry.testing.DatabaseHelper.persistActiveDomain;
-import static google.registry.testing.DatabaseHelper.persistContactWithPendingTransfer;
 import static google.registry.testing.DatabaseHelper.persistDomainWithDependentResources;
 import static google.registry.testing.DatabaseHelper.persistDomainWithPendingTransfer;
 import static google.registry.testing.DatabaseHelper.persistNewRegistrars;
@@ -89,18 +88,6 @@ public class ResaveAllEppResourcesPipelineTest {
     assertThat(loadByEntity(contact)).isEqualTo(contact);
   }
 
-  @Test
-  void testPipeline_fulfilledContactTransfer() {
-    Contact contact = persistActiveContact("test123");
-    DateTime now = fakeClock.nowUtc();
-    contact = persistContactWithPendingTransfer(contact, now, now.plusDays(5), now);
-    fakeClock.advanceBy(Duration.standardDays(10));
-    assertThat(loadByEntity(contact).getStatusValues()).contains(StatusValue.PENDING_TRANSFER);
-    runPipeline();
-    assertThat(loadByEntity(contact).getStatusValues())
-        .doesNotContain(StatusValue.PENDING_TRANSFER);
-  }
-
   @Test
   void testPipeline_fulfilledDomainTransfer() {
     options.setFast(true);

core/src/test/java/google/registry/beam/wipeout/WipeOutContactHistoryPiiPipelineTest.java

@@ -1,196 +0,0 @@
-// Copyright 2023 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.beam.wipeout;
-
-import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.truth.Truth.assertThat;
-import static google.registry.model.reporting.HistoryEntry.Type.CONTACT_CREATE;
-import static google.registry.persistence.PersistenceModule.TransactionIsolationLevel.TRANSACTION_REPEATABLE_READ;
-import static google.registry.testing.DatabaseHelper.loadAllOf;
-import static google.registry.testing.DatabaseHelper.newContact;
-import static google.registry.testing.DatabaseHelper.persistResource;
-import static org.hibernate.cfg.AvailableSettings.ISOLATION;
-
-import com.google.common.collect.ImmutableList;
-import google.registry.beam.TestPipelineExtension;
-import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactHistory;
-import google.registry.model.contact.ContactPhoneNumber;
-import google.registry.model.reporting.HistoryEntryDao;
-import google.registry.persistence.transaction.JpaTestExtensions;
-import google.registry.persistence.transaction.JpaTestExtensions.JpaIntegrationTestExtension;
-import google.registry.testing.FakeClock;
-import org.apache.beam.sdk.options.PipelineOptionsFactory;
-import org.joda.time.DateTime;
-import org.joda.time.Duration;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.RegisterExtension;
-
-/** Unit tests for {@link WipeOutContactHistoryPiiPipeline}. */
-public class WipeOutContactHistoryPiiPipelineTest {
-
-  private static final int MIN_AGE_IN_MONTHS = 18;
-  private static final DateTimeFormatter DATE_TIME_FORMATTER =
-      DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ");
-
-  private final FakeClock clock = new FakeClock(DateTime.parse("2020-02-02T12:34:56Z"));
-  private final WipeOutContactHistoryPiiPipelineOptions options =
-      PipelineOptionsFactory.create().as(WipeOutContactHistoryPiiPipelineOptions.class);
-  private Contact contact1;
-  private Contact contact2;
-
-  @RegisterExtension
-  final JpaIntegrationTestExtension jpa =
-      new JpaTestExtensions.Builder()
-          .withClock(clock)
-          .withProperty(ISOLATION, TRANSACTION_REPEATABLE_READ.name())
-          .buildIntegrationTestExtension();
-
-  @RegisterExtension
-  final TestPipelineExtension pipeline =
-      TestPipelineExtension.create().enableAbandonedNodeEnforcement(true);
-
-  @BeforeEach
-  void beforeEach() {
-    contact1 =
-        persistResource(
-            newContact("my-contact1")
-                .asBuilder()
-                .setEmailAddress("test@example.com")
-                .setFaxNumber(
-                    new ContactPhoneNumber.Builder().setPhoneNumber("+12122122122").build())
-                .build());
-    contact2 =
-        persistResource(
-            newContact("my-contact2")
-                .asBuilder()
-                .setEmailAddress("test@example.tld")
-                .setVoiceNumber(
-                    new ContactPhoneNumber.Builder().setPhoneNumber("+19177199177").build())
-                .build());
-    // T = 0 month;
-    persistResource(createHistory(contact1));
-    // T = 5 months;
-    advanceMonths(5);
-    persistResource(createHistory(contact2));
-    // T = 10 months;
-    advanceMonths(5);
-    persistResource(createHistory(contact1));
-    persistResource(createHistory(contact2));
-    // T = 20 months;
-    advanceMonths(10);
-    persistResource(createHistory(contact2));
-    // T = 30 months;
-    advanceMonths(10);
-    options.setCutoffTime(DATE_TIME_FORMATTER.print(clock.nowUtc().minusMonths(MIN_AGE_IN_MONTHS)));
-  }
-
-  @Test
-  void testSuccess() {
-    // Before the pipeline runs, every history entry should have an emali address.
-    assertThat(
-            loadAllOf(ContactHistory.class).stream()
-                .filter(e -> e.getContactBase().get().getEmailAddress() != null)
-                .count())
-        .isEqualTo(5);
-    // Before the pipeline runs, contact history for contact1 should have fax numbers.
-    ImmutableList<ContactHistory> histories =
-        HistoryEntryDao.loadHistoryObjectsForResource(contact1.createVKey(), ContactHistory.class);
-    assertThat(
-            histories.stream().filter(e -> e.getContactBase().get().getFaxNumber() != null).count())
-        .isEqualTo(2);
-    // Before the pipeline runs, contact history for contact2 should have voice numbers.
-    histories =
-        HistoryEntryDao.loadHistoryObjectsForResource(contact2.createVKey(), ContactHistory.class);
-    assertThat(
-            histories.stream()
-                .filter(e -> e.getContactBase().get().getVoiceNumber() != null)
-                .count())
-        .isEqualTo(3);
-    WipeOutContactHistoryPiiPipeline wipeOutContactHistoryPiiPipeline =
-        new WipeOutContactHistoryPiiPipeline(options);
-    wipeOutContactHistoryPiiPipeline.run(pipeline).waitUntilFinish();
-    histories =
-        HistoryEntryDao.loadHistoryObjectsForResource(contact1.createVKey(), ContactHistory.class);
-    assertThat(histories.size()).isEqualTo(2);
-    ImmutableList<ContactHistory> wipedEntries =
-        histories.stream()
-            .filter(e -> e.getContactBase().get().getEmailAddress() == null)
-            .collect(toImmutableList());
-    // Only the history entry at T = 10 is wiped. The one at T = 10 is over 18 months old, but it
-    // is the most recent entry, so it is kept.
-    assertThat(wipedEntries.size()).isEqualTo(1);
-    assertThat(wipedEntries.get(0).getContactBase().get().getFaxNumber()).isNull();
-    // With a new history entry at T = 30, the one at T = 10 is eligible for wipe out. Note the
-    // current time itself (therefore the cutoff time) has not changed.
-    persistResource(createHistory(contact1));
-    wipeOutContactHistoryPiiPipeline.run(pipeline).waitUntilFinish();
-    histories =
-        HistoryEntryDao.loadHistoryObjectsForResource(contact1.createVKey(), ContactHistory.class);
-    assertThat(histories.size()).isEqualTo(3);
-    wipedEntries =
-        histories.stream()
-            .filter(e -> e.getContactBase().get().getEmailAddress() == null)
-            .collect(toImmutableList());
-    assertThat(wipedEntries.size()).isEqualTo(2);
-    // Check that the pipeline deals with multiple contacts correctly.
-    histories =
-        HistoryEntryDao.loadHistoryObjectsForResource(contact2.createVKey(), ContactHistory.class);
-    assertThat(histories.size()).isEqualTo(3);
-    wipedEntries =
-        histories.stream()
-            .filter(e -> e.getContactBase().get().getEmailAddress() == null)
-            .collect(toImmutableList());
-    // Only the history entry at T = 10 is wiped. The one at T = 10 is over 18 months old, but it
-    // is the most recent entry, so it is kept.
-    assertThat(wipedEntries.size()).isEqualTo(2);
-    assertThat(wipedEntries.get(0).getContactBase().get().getVoiceNumber()).isNull();
-    assertThat(wipedEntries.get(1).getContactBase().get().getVoiceNumber()).isNull();
-  }
-
-  @Test
-  void testSuccess_dryRun() {
-    options.setIsDryRun(true);
-    WipeOutContactHistoryPiiPipeline wipeOutContactHistoryPiiPipeline =
-        new WipeOutContactHistoryPiiPipeline(options);
-    wipeOutContactHistoryPiiPipeline.run(pipeline).waitUntilFinish();
-    ImmutableList<ContactHistory> histories =
-        HistoryEntryDao.loadHistoryObjectsForResource(contact1.createVKey(), ContactHistory.class);
-    assertThat(histories.size()).isEqualTo(2);
-    assertThat(
-            histories.stream()
-                .filter(e -> e.getContactBase().get().getEmailAddress() == null)
-                .collect(toImmutableList()))
-        .isEmpty();
-  }
-
-  private ContactHistory createHistory(Contact contact) {
-    return new ContactHistory.Builder()
-        .setContact(contact)
-        .setType(CONTACT_CREATE)
-        .setRegistrarId("TheRegistrar")
-        .setModificationTime(clock.nowUtc())
-        .build();
-  }
-
-  private void advanceMonths(int months) {
-    DateTime now = clock.nowUtc();
-    DateTime next = now.plusMonths(months);
-    clock.advanceBy(new Duration(now, next));
-  }
-}

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/ResourceFlowTestCase.java

@@ -24,13 +24,10 @@ import com.google.common.collect.Iterables;
 import com.google.common.testing.TestLogHandler;
 import google.registry.model.EppResource;
 import google.registry.model.ForeignKeyUtils;
-import google.registry.model.contact.ContactBase;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.eppinput.EppInput.ResourceCommandWrapper;
 import google.registry.model.eppinput.ResourceCommand;
-import google.registry.model.host.HostBase;
 import google.registry.model.host.HostHistory;
 import google.registry.model.reporting.HistoryEntry;
 import google.registry.model.tmch.ClaimsList;
@@ -131,18 +128,12 @@ public abstract class ResourceFlowTestCase<F extends Flow, R extends EppResource
 
   protected void assertLastHistoryContainsResource(EppResource resource) {
     HistoryEntry historyEntry = Iterables.getLast(DatabaseHelper.getHistoryEntries(resource));
-    if (resource instanceof ContactBase) {
-      ContactHistory contactHistory = (ContactHistory) historyEntry;
-      // Don't use direct equals comparison since one might be a subclass of the other
-      assertAboutImmutableObjects()
-          .that(contactHistory.getContactBase().get())
-          .hasFieldsEqualTo(resource);
-    } else if (resource instanceof DomainBase) {
+    if (resource instanceof DomainBase) {
       DomainHistory domainHistory = (DomainHistory) historyEntry;
       assertAboutImmutableObjects()
           .that(domainHistory.getDomainBase().get())
           .isEqualExceptFields(resource, "gracePeriods", "dsData", "nsHosts");
-    } else if (resource instanceof HostBase) {
+    } else {
       HostHistory hostHistory = (HostHistory) historyEntry;
       // Don't use direct equals comparison since one might be a subclass of the other
       assertAboutImmutableObjects()

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/domain/DomainCreateFlowTest.java

@@ -119,7 +119,6 @@ import google.registry.flows.domain.DomainFlowUtils.MalformedTcnIdException;
 import google.registry.flows.domain.DomainFlowUtils.MaxSigLifeNotSupportedException;
 import google.registry.flows.domain.DomainFlowUtils.MissingBillingAccountMapException;
 import google.registry.flows.domain.DomainFlowUtils.MissingClaimsNoticeException;
-import google.registry.flows.domain.DomainFlowUtils.MissingContactTypeException;
 import google.registry.flows.domain.DomainFlowUtils.NameserversNotAllowedForTldException;
 import google.registry.flows.domain.DomainFlowUtils.NameserversNotSpecifiedForTldWithNameserverAllowListException;
 import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException;
@@ -1874,15 +1873,6 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
             .build());
   }
 
-  @Test
-  void testFailure_missingContactType() {
-    // We need to test for missing type, but not for invalid - the schema enforces that for us.
-    setEppInput("domain_create_missing_contact_type.xml");
-    persistContactsAndHosts();
-    EppException thrown = assertThrows(MissingContactTypeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
   @Test
   void testFailure_minimumDataset_noRegistrantButSomeOtherContactTypes() throws Exception {
     setEppInput("domain_create_other_contact_types.xml");

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

@@ -64,7 +64,6 @@ import google.registry.model.billing.BillingBase.RenewalPriceBehavior;
 import google.registry.model.billing.BillingCancellation;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.billing.BillingRecurrence;
-import google.registry.model.contact.ContactAuthInfo;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainAuthInfo;
 import google.registry.model.domain.DomainHistory;
@@ -153,12 +152,6 @@ class DomainTransferApproveFlowTest
                 .build());
   }
 
-  private void setEppLoader(String commandFilename) {
-    setEppInput(commandFilename);
-    // Replace the ROID in the xml file with the one generated in our test.
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
-  }
-
   /**
    * Runs a successful test, with the expectedCancellationBillingEvents parameter containing a list
    * of billing event builders that will be filled out with the correct HistoryEntry parent as it is
@@ -184,7 +177,7 @@ class DomainTransferApproveFlowTest
       String expectedXmlFilename,
       DateTime expectedExpirationTime)
       throws Exception {
-    setEppLoader(commandFilename);
+    setEppInput(commandFilename);
     Tld registry = Tld.get(tld);
     domain = reloadResourceByForeignKey();
     // Make sure the implicit billing event is there; it will be deleted by the flow.
@@ -361,7 +354,7 @@ class DomainTransferApproveFlowTest
   }
 
   private void doFailingTest(String commandFilename) throws Exception {
-    setEppLoader(commandFilename);
+    setEppInput(commandFilename);
     // Setup done; run the test.
     assertMutatingFlow(true);
     runFlow();
@@ -376,7 +369,7 @@ class DomainTransferApproveFlowTest
 
   @Test
   void testDryRun() throws Exception {
-    setEppLoader("domain_transfer_approve.xml");
+    setEppInput("domain_transfer_approve.xml");
     dryRunFlowAssertResponse(loadFile("domain_transfer_approve_response.xml"));
   }
 
@@ -492,14 +485,6 @@ class DomainTransferApproveFlowTest
         "domain_transfer_approve_response.xml");
   }
 
-  @Test
-  void testSuccess_contactAuthInfo() throws Exception {
-    doSuccessfulTest(
-        "tld",
-        "domain_transfer_approve_contact_authinfo.xml",
-        "domain_transfer_approve_response.xml");
-  }
-
   @Test
   void testSuccess_autorenewBeforeTransfer() throws Exception {
     domain = reloadResourceByForeignKey();
@@ -619,14 +604,8 @@ class DomainTransferApproveFlowTest
   }
 
   @Test
-  void testFailure_badContactPassword() {
-    // Change the contact's password so it does not match the password in the file.
-    contact =
-        persistResource(
-            contact
-                .asBuilder()
-                .setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("badpassword")))
-                .build());
+  void testFailure_contactPassword() {
+    // Contact passwords cannot be provided because we don't store contacts
     EppException thrown =
         assertThrows(
             BadAuthInfoForResourceException.class,

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

@@ -43,7 +43,6 @@ import google.registry.flows.ResourceFlowUtils.ResourceDoesNotExistException;
 import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException;
 import google.registry.flows.exceptions.NotPendingTransferException;
 import google.registry.flows.exceptions.NotTransferInitiatorException;
-import google.registry.model.contact.ContactAuthInfo;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainAuthInfo;
 import google.registry.model.domain.DomainHistory;
@@ -75,8 +74,6 @@ class DomainTransferCancelFlowTest
   private void doSuccessfulTest(String commandFilename) throws Exception {
     setEppInput(commandFilename);
 
-    // Replace the ROID in the xml file with the one generated in our test.
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     // Make sure the implicit billing event is there; it will be deleted by the flow.
     // We also expect to see autorenew events for the gaining and losing registrars.
     assertBillingEvents(
@@ -187,8 +184,6 @@ class DomainTransferCancelFlowTest
 
   private void doFailingTest(String commandFilename) throws Exception {
     setEppInput(commandFilename);
-    // Replace the ROID in the xml file with the one generated in our test.
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     // Setup done; run the test.
     assertMutatingFlow(true);
     runFlow();
@@ -204,7 +199,6 @@ class DomainTransferCancelFlowTest
   @Test
   void testDryRun() throws Exception {
     setEppInput("domain_transfer_cancel.xml");
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     dryRunFlowAssertResponse(loadFile("domain_transfer_cancel_response.xml"));
   }
 
@@ -219,19 +213,8 @@ class DomainTransferCancelFlowTest
   }
 
   @Test
-  void testSuccess_contactAuthInfo() throws Exception {
-    doSuccessfulTest("domain_transfer_cancel_contact_authinfo.xml");
-  }
-
-  @Test
-  void testFailure_badContactPassword() {
-    // Change the contact's password so it does not match the password in the file.
-    contact =
-        persistResource(
-            contact
-                .asBuilder()
-                .setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("badpassword")))
-                .build());
+  void testFailure_contactPassword() {
+    // Contact passwords cannot be provided because we don't store contacts
     EppException thrown =
         assertThrows(
             BadAuthInfoForResourceException.class,

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

@@ -20,7 +20,6 @@ import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_CREATE;
 import static google.registry.testing.DatabaseHelper.createBillingEventForTransfer;
 import static google.registry.testing.DatabaseHelper.createTld;
 import static google.registry.testing.DatabaseHelper.getOnlyHistoryEntryOfType;
-import static google.registry.testing.DatabaseHelper.persistActiveContact;
 import static google.registry.testing.DatabaseHelper.persistDomainWithDependentResources;
 import static google.registry.testing.DatabaseHelper.persistDomainWithPendingTransfer;
 import static google.registry.testing.DatabaseHelper.persistResource;
@@ -36,7 +35,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.Domain;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.eppcommon.StatusValue;
@@ -72,7 +70,6 @@ abstract class DomainTransferFlowTestCase<F extends Flow, R extends EppResource>
   static final DateTime EXTENDED_REGISTRATION_EXPIRATION_TIME =
       REGISTRATION_EXPIRATION_TIME.plusYears(EXTENDED_REGISTRATION_YEARS);
 
-  protected Contact contact;
   protected Domain domain;
   Host subordinateHost;
   private DomainHistory historyEntryDomainCreate;
@@ -104,12 +101,11 @@ abstract class DomainTransferFlowTestCase<F extends Flow, R extends EppResource>
   /** Adds a domain with no pending transfer on it. */
   void setupDomain(String label, String tld) {
     createTld(tld);
-    contact = persistActiveContact("jd1234");
     domain =
         persistDomainWithDependentResources(
             label,
             tld,
-            contact,
+            null,
             clock.nowUtc(),
             DateTime.parse("1999-04-03T22:00:00.0Z"),
             REGISTRATION_EXPIRATION_TIME);

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

@@ -29,7 +29,6 @@ import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException;
 import google.registry.flows.ResourceFlowUtils.ResourceDoesNotExistException;
 import google.registry.flows.exceptions.NoTransferHistoryToQueryException;
 import google.registry.flows.exceptions.NotAuthorizedToViewTransferException;
-import google.registry.model.contact.ContactAuthInfo;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainAuthInfo;
 import google.registry.model.eppcommon.AuthInfo.PasswordAuth;
@@ -52,8 +51,6 @@ class DomainTransferQueryFlowTest
   private void doSuccessfulTest(
       String commandFilename, String expectedXmlFilename, int numPollMessages) throws Exception {
     setEppInput(commandFilename);
-    // Replace the ROID in the xml file with the one generated in our test.
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     // Setup done; run the test.
     assertMutatingFlow(false);
     runFlowAssertResponse(loadFile(expectedXmlFilename));
@@ -73,8 +70,6 @@ class DomainTransferQueryFlowTest
 
   private void doFailingTest(String commandFilename) throws Exception {
     setEppInput(commandFilename);
-    // Replace the ROID in the xml file with the one generated in our test.
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     // Setup done; run the test.
     assertMutatingFlow(false);
     runFlow();
@@ -105,13 +100,6 @@ class DomainTransferQueryFlowTest
         "domain_transfer_query_domain_authinfo.xml", "domain_transfer_query_response.xml", 1);
   }
 
-  @Test
-  void testSuccess_contactAuthInfo() throws Exception {
-    setRegistrarIdForFlow("ClientZ");
-    doSuccessfulTest(
-        "domain_transfer_query_contact_authinfo.xml", "domain_transfer_query_response.xml", 1);
-  }
-
   @Test
   void testSuccess_clientApproved() throws Exception {
     changeTransferStatus(TransferStatus.CLIENT_APPROVED);
@@ -170,14 +158,7 @@ class DomainTransferQueryFlowTest
   }
 
   @Test
-  void testFailure_badContactPassword() {
-    // Change the contact's password so it does not match the password in the file.
-    contact =
-        persistResource(
-            contact
-                .asBuilder()
-                .setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("badpassword")))
-                .build());
+  void testFailure_contactPasswordNotAllowed() {
     EppException thrown =
         assertThrows(
             BadAuthInfoForResourceException.class,

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

@@ -43,7 +43,6 @@ import google.registry.flows.ResourceFlowUtils.ResourceDoesNotExistException;
 import google.registry.flows.ResourceFlowUtils.ResourceNotOwnedException;
 import google.registry.flows.domain.DomainFlowUtils.NotAuthorizedForTldException;
 import google.registry.flows.exceptions.NotPendingTransferException;
-import google.registry.model.contact.ContactAuthInfo;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainAuthInfo;
 import google.registry.model.domain.DomainHistory;
@@ -78,7 +77,6 @@ class DomainTransferRejectFlowTest
   private void doSuccessfulTest(String commandFilename, String expectedXmlFilename)
       throws Exception {
     setEppInput(commandFilename);
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     // Make sure the implicit billing event is there; it will be deleted by the flow.
     // We also expect to see autorenew events for the gaining and losing registrars.
     assertBillingEvents(
@@ -149,8 +147,6 @@ class DomainTransferRejectFlowTest
 
   private void doFailingTest(String commandFilename) throws Exception {
     setEppInput(commandFilename);
-    // Replace the ROID in the xml file with the one generated in our test.
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     // Setup done; run the test.
     assertMutatingFlow(true);
     runFlow();
@@ -171,7 +167,6 @@ class DomainTransferRejectFlowTest
   @Test
   void testDryRun() throws Exception {
     setEppInput("domain_transfer_reject.xml");
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     dryRunFlowAssertResponse(loadFile("domain_transfer_reject_response.xml"));
   }
 
@@ -181,12 +176,6 @@ class DomainTransferRejectFlowTest
         "domain_transfer_reject_domain_authinfo.xml", "domain_transfer_reject_response.xml");
   }
 
-  @Test
-  void testSuccess_contactAuthInfo() throws Exception {
-    doSuccessfulTest(
-        "domain_transfer_reject_contact_authinfo.xml", "domain_transfer_reject_response.xml");
-  }
-
   @Test
   void testFailure_notAuthorizedForTld() {
     persistResource(
@@ -209,14 +198,8 @@ class DomainTransferRejectFlowTest
   }
 
   @Test
-  void testFailure_badContactPassword() {
-    // Change the contact's password so it does not match the password in the file.
-    contact =
-        persistResource(
-            contact
-                .asBuilder()
-                .setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("badpassword")))
-                .build());
+  void testFailure_contactPassword() {
+    // Contact passwords cannot be provided because we don't store contacts
     EppException thrown =
         assertThrows(
             BadAuthInfoForResourceException.class,

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

@@ -40,7 +40,6 @@ import static google.registry.testing.DatabaseHelper.loadByEntity;
 import static google.registry.testing.DatabaseHelper.loadByKey;
 import static google.registry.testing.DatabaseHelper.loadByKeys;
 import static google.registry.testing.DatabaseHelper.loadRegistrar;
-import static google.registry.testing.DatabaseHelper.persistActiveContact;
 import static google.registry.testing.DatabaseHelper.persistResource;
 import static google.registry.testing.DomainSubject.assertAboutDomains;
 import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions;
@@ -96,7 +95,6 @@ import google.registry.model.billing.BillingBase.RenewalPriceBehavior;
 import google.registry.model.billing.BillingCancellation;
 import google.registry.model.billing.BillingEvent;
 import google.registry.model.billing.BillingRecurrence;
-import google.registry.model.contact.ContactAuthInfo;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainAuthInfo;
 import google.registry.model.domain.DomainHistory;
@@ -470,8 +468,6 @@ class DomainTransferRequestFlowTest
       throws Exception {
     setEppInput(commandFilename, substitutions);
     ImmutableSet<GracePeriod> originalGracePeriods = domain.getGracePeriods();
-    // Replace the ROID in the xml file with the one generated in our test.
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     // For all of the other transfer flow tests, 'now' corresponds to day 3 of the transfer, but
     // for the request test we want that same 'now' to be the initial request time, so we shift
     // the transfer timeline 3 days later by adjusting the implicit transfer time here.
@@ -571,8 +567,6 @@ class DomainTransferRequestFlowTest
     eppRequestSource = EppRequestSource.TOOL;
     setEppInput(commandFilename, substitutions);
     ImmutableSet<GracePeriod> originalGracePeriods = domain.getGracePeriods();
-    // Replace the ROID in the xml file with the one generated in our test.
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     // For all of the other transfer flow tests, 'now' corresponds to day 3 of the transfer, but
     // for the request test we want that same 'now' to be the initial request time, so we shift
     // the transfer timeline 3 days later by adjusting the implicit transfer time here.
@@ -626,8 +620,6 @@ class DomainTransferRequestFlowTest
       String commandFilename, UserPrivileges userPrivileges, Map<String, String> substitutions)
       throws Exception {
     setEppInput(commandFilename, substitutions);
-    // Replace the ROID in the xml file with the one generated in our test.
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     // Setup done; run the test.
     assertMutatingFlow(true);
     runFlow(CommitMode.LIVE, userPrivileges);
@@ -657,7 +649,6 @@ class DomainTransferRequestFlowTest
   void testDryRun() throws Exception {
     setupDomain("example", "tld");
     setEppInput("domain_transfer_request.xml");
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     dryRunFlowAssertResponse(loadFile("domain_transfer_request_response.xml"));
   }
 
@@ -1184,7 +1175,6 @@ class DomainTransferRequestFlowTest
     // This ensures that the transfer has non-premium cost, as otherwise, the fee extension would be
     // required to ack the premium price.
     setEppInput("domain_transfer_request.xml");
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     runFlowAssertResponse(loadFile("domain_transfer_request_response.xml"));
     domain = loadByEntity(domain);
 
@@ -1238,7 +1228,6 @@ class DomainTransferRequestFlowTest
     DateTime now = clock.nowUtc();
 
     setEppInput("domain_transfer_request.xml");
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     runFlowAssertResponse(loadFile("domain_transfer_request_response.xml"));
     domain = loadByEntity(domain);
 
@@ -1300,7 +1289,6 @@ class DomainTransferRequestFlowTest
     DateTime now = clock.nowUtc();
 
     setEppInput("domain_transfer_request.xml");
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     runFlowAssertResponse(loadFile("domain_transfer_request_response.xml"));
     domain = loadByEntity(domain);
 
@@ -1361,7 +1349,6 @@ class DomainTransferRequestFlowTest
     DateTime now = clock.nowUtc();
 
     setEppInput("domain_transfer_request.xml");
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     runFlowAssertResponse(loadFile("domain_transfer_request_response.xml"));
     domain = loadByEntity(domain);
 
@@ -1518,36 +1505,6 @@ class DomainTransferRequestFlowTest
     assertAboutEppExceptions().that(thrown).marshalsToXml();
   }
 
-  @Test
-  void testFailure_badContactPassword() {
-    setupDomain("example", "tld");
-    // Change the contact's password so it does not match the password in the file.
-    contact =
-        persistResource(
-            contact
-                .asBuilder()
-                .setAuthInfo(ContactAuthInfo.create(PasswordAuth.create("badpassword")))
-                .build());
-    EppException thrown =
-        assertThrows(
-            BadAuthInfoForResourceException.class,
-            () -> doFailingTest("domain_transfer_request.xml"));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_badContactRepoId() {
-    setupDomain("example", "tld");
-    // Set the contact to a different ROID, but don't persist it; this is just so the substitution
-    // code above will write the wrong ROID into the file.
-    contact = contact.asBuilder().setRepoId("DEADBEEF_TLD-ROID").build();
-    EppException thrown =
-        assertThrows(
-            BadAuthInfoForResourceException.class,
-            () -> doFailingTest("domain_transfer_request.xml"));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
   @Test
   void testSuccess_clientApproved() throws Exception {
     setupDomain("example", "tld");
@@ -1651,7 +1608,6 @@ class DomainTransferRequestFlowTest
     setEppInput(
         "domain_transfer_request_wildcard.xml",
         ImmutableMap.of("YEARS", "1", "DOMAIN", "--invalid", "EXDATE", "2002-09-08T22:00:00.0Z"));
-    eppLoader.replaceAll("JD1234-REP", contact.getRepoId());
     assertMutatingFlow(true);
     ResourceDoesNotExistException thrown =
         assertThrows(
@@ -1663,7 +1619,6 @@ class DomainTransferRequestFlowTest
   @Test
   void testFailure_nonexistentDomain() {
     createTld("tld");
-    contact = persistActiveContact("jd1234");
     ResourceDoesNotExistException thrown =
         assertThrows(
             ResourceDoesNotExistException.class,
@@ -1671,6 +1626,22 @@ class DomainTransferRequestFlowTest
     assertThat(thrown).hasMessageThat().contains(String.format("(%s)", "example.tld"));
   }
 
+  @Test
+  void testFailure_cannotUseContactAuthInfo() {
+    // RFC 5731: "An OPTIONAL "roid" attribute MUST be used to identify the registrant or contact
+    // object if and only if the given authInfo is associated with a registrant or contact object,
+    // and not the domain object itself."
+    //
+    // We have no contacts, so it cannot be valid to specify a roid
+    setupDomain("example", "tld");
+    assertAboutEppExceptions()
+        .that(
+            assertThrows(
+                BadAuthInfoForResourceException.class,
+                () -> doFailingTest("domain_transfer_request_contact_auth_info_failure.xml")))
+        .marshalsToXml();
+  }
+
   @Test
   void testFailure_periodInMonths() {
     setupDomain("example", "tld");

core/src/test/java/google/registry/flows/poll/PollAckFlowTest.java

@@ -17,7 +17,6 @@ package google.registry.flows.poll;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.DatabaseHelper.createHistoryEntryForEppResource;
 import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.persistActiveContact;
 import static google.registry.testing.DatabaseHelper.persistResource;
 import static google.registry.util.DateTimeUtils.END_OF_TIME;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -28,7 +27,6 @@ import google.registry.flows.poll.PollAckFlow.InvalidMessageIdException;
 import google.registry.flows.poll.PollAckFlow.MessageDoesNotExistException;
 import google.registry.flows.poll.PollAckFlow.MissingMessageIdException;
 import google.registry.flows.poll.PollAckFlow.NotAuthorizedToAckMessageException;
-import google.registry.model.contact.Contact;
 import google.registry.model.domain.Domain;
 import google.registry.model.poll.PollMessage;
 import google.registry.testing.DatabaseHelper;
@@ -43,7 +41,6 @@ class PollAckFlowTest extends FlowTestCase<PollAckFlow> {
   private static final long MESSAGE_ID = 3;
 
   private Domain domain;
-  private Contact contact;
 
   @BeforeEach
   void setUp() {
@@ -51,8 +48,7 @@ class PollAckFlowTest extends FlowTestCase<PollAckFlow> {
     clock.setTo(DateTime.parse("2011-01-02T01:01:01Z"));
     setRegistrarIdForFlow("NewRegistrar");
     createTld("example");
-    contact = persistActiveContact("jd1234");
-    domain = persistResource(DatabaseHelper.newDomain("test.example", contact));
+    domain = persistResource(DatabaseHelper.newDomain("test.example"));
   }
 
   private void persistOneTimePollMessage(long messageId) {
@@ -85,43 +81,6 @@ class PollAckFlowTest extends FlowTestCase<PollAckFlow> {
     dryRunFlowAssertResponse(loadFile("poll_ack_response_empty.xml"));
   }
 
-  @Test
-  void testSuccess_contactPollMessage() throws Exception {
-    setEppInput("poll_ack.xml", ImmutableMap.of("MSGID", "3-2011"));
-    persistResource(
-        new PollMessage.OneTime.Builder()
-            .setId(MESSAGE_ID)
-            .setRegistrarId(getRegistrarIdForFlow())
-            .setEventTime(clock.nowUtc().minusDays(1))
-            .setMsg("Some poll message.")
-            .setHistoryEntry(createHistoryEntryForEppResource(contact))
-            .build());
-    assertMutatingFlow(true);
-    runFlowAssertResponse(loadFile("poll_ack_response_empty.xml"));
-  }
-
-  @Test
-  void testFailure_contactPollMessage_withIncorrectYearField() throws Exception {
-    setEppInput("poll_ack.xml", ImmutableMap.of("MSGID", "3-1999"));
-    persistResource(
-        new PollMessage.OneTime.Builder()
-            .setId(MESSAGE_ID)
-            .setRegistrarId(getRegistrarIdForFlow())
-            .setEventTime(clock.nowUtc().minusDays(1))
-            .setMsg("Some poll message.")
-            .setHistoryEntry(createHistoryEntryForEppResource(contact))
-            .build());
-    assertMutatingFlow(true);
-    assertThrows(MessageDoesNotExistException.class, this::runFlow);
-  }
-
-  @Test
-  void testSuccess_messageOnContact() throws Exception {
-    persistOneTimePollMessage(MESSAGE_ID);
-    assertMutatingFlow(true);
-    runFlowAssertResponse(loadFile("poll_ack_response_empty.xml"));
-  }
-
   @Test
   void testSuccess_recentActiveAutorenew() throws Exception {
     setEppInput("poll_ack.xml", ImmutableMap.of("MSGID", "3-2010"));
@@ -184,21 +143,6 @@ class PollAckFlowTest extends FlowTestCase<PollAckFlow> {
     assertThrows(InvalidMessageIdException.class, this::runFlow);
   }
 
-  @Test
-  void testFailure_contactPollMessage_withMissingYearField() throws Exception {
-    setEppInput("poll_ack.xml", ImmutableMap.of("MSGID", "3"));
-    persistResource(
-        new PollMessage.OneTime.Builder()
-            .setId(MESSAGE_ID)
-            .setRegistrarId(getRegistrarIdForFlow())
-            .setEventTime(clock.nowUtc().minusDays(1))
-            .setMsg("Some poll message.")
-            .setHistoryEntry(createHistoryEntryForEppResource(contact))
-            .build());
-    assertMutatingFlow(true);
-    assertThrows(InvalidMessageIdException.class, this::runFlow);
-  }
-
   @Test
   void testFailure_invalidId_stringInsteadOfNumeric() throws Exception {
     setEppInput("poll_ack.xml", ImmutableMap.of("MSGID", "ABC-12345"));

core/src/test/java/google/registry/flows/poll/PollRequestFlowTest.java

@@ -16,7 +16,6 @@ package google.registry.flows.poll;
 
 import static google.registry.testing.DatabaseHelper.createHistoryEntryForEppResource;
 import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.persistActiveContact;
 import static google.registry.testing.DatabaseHelper.persistActiveHost;
 import static google.registry.testing.DatabaseHelper.persistNewRegistrar;
 import static google.registry.testing.DatabaseHelper.persistResource;
@@ -27,8 +26,6 @@ import com.google.common.collect.ImmutableList;
 import google.registry.flows.EppException;
 import google.registry.flows.FlowTestCase;
 import google.registry.flows.poll.PollRequestFlow.UnexpectedMessageIdException;
-import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.Domain;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.host.Host;
@@ -36,7 +33,6 @@ import google.registry.model.host.HostHistory;
 import google.registry.model.poll.PendingActionNotificationResponse.DomainPendingActionNotificationResponse;
 import google.registry.model.poll.PollMessage;
 import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.transfer.TransferResponse.ContactTransferResponse;
 import google.registry.model.transfer.TransferResponse.DomainTransferResponse;
 import google.registry.model.transfer.TransferStatus;
 import google.registry.testing.DatabaseHelper;
@@ -48,7 +44,6 @@ import org.junit.jupiter.api.Test;
 class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
 
   private Domain domain;
-  private Contact contact;
   private Host host;
 
   @BeforeEach
@@ -58,8 +53,7 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
     setRegistrarIdForFlow("NewRegistrar");
     createTld("example");
     persistNewRegistrar("BadRegistrar");
-    contact = persistActiveContact("jd1234");
-    domain = persistResource(DatabaseHelper.newDomain("test.example", contact));
+    domain = persistResource(DatabaseHelper.newDomain("test.example"));
     host = persistActiveHost("ns1.test.example");
   }
 
@@ -99,31 +93,6 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
     runFlowAssertResponse(loadFile("poll_response_domain_transfer_no_cltrid.xml"));
   }
 
-  @Test
-  void testSuccess_contactTransferPending() throws Exception {
-    setRegistrarIdForFlow("TheRegistrar");
-    persistResource(
-        new PollMessage.OneTime.Builder()
-            .setId(3L)
-            .setRegistrarId(getRegistrarIdForFlow())
-            .setEventTime(clock.nowUtc().minusDays(5))
-            .setMsg("Transfer requested.")
-            .setResponseData(
-                ImmutableList.of(
-                    new ContactTransferResponse.Builder()
-                        .setContactId("sh8013")
-                        .setTransferStatus(TransferStatus.PENDING)
-                        .setGainingRegistrarId(getRegistrarIdForFlow())
-                        .setTransferRequestTime(clock.nowUtc().minusDays(5))
-                        .setLosingRegistrarId("NewRegistrar")
-                        .setPendingTransferExpirationTime(clock.nowUtc())
-                        .build()))
-            .setHistoryEntry(createHistoryEntryForEppResource(contact))
-            .build());
-    assertMutatingFlow(false);
-    runFlowAssertResponse(loadFile("poll_response_contact_transfer.xml"));
-  }
-
   @Test
   void testSuccess_domainPendingActionComplete() throws Exception {
     persistResource(
@@ -225,29 +194,6 @@ class PollRequestFlowTest extends FlowTestCase<PollRequestFlow> {
     runFlowAssertResponse(loadFile("poll_response_empty.xml"));
   }
 
-  @Test
-  void testSuccess_contactDelete() throws Exception {
-    // Contact delete poll messages do not have any response data, so ensure that no
-    // response data block is produced in the poll message.
-    HistoryEntry historyEntry =
-        persistResource(
-            new ContactHistory.Builder()
-                .setRegistrarId("NewRegistrar")
-                .setModificationTime(clock.nowUtc().minusDays(1))
-                .setType(HistoryEntry.Type.CONTACT_DELETE)
-                .setContact(contact)
-                .build());
-    persistResource(
-        new PollMessage.OneTime.Builder()
-            .setRegistrarId("NewRegistrar")
-            .setMsg("Deleted contact jd1234")
-            .setHistoryEntry(historyEntry)
-            .setEventTime(clock.nowUtc().minusDays(1))
-            .build());
-    assertMutatingFlow(false);
-    runFlowAssertResponse(loadFile("poll_response_contact_delete.xml"));
-  }
-
   @Test
   void testSuccess_hostDelete() throws Exception {
     // Host delete poll messages do not have any response data, so ensure that no

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/model/poll/PollMessageExternalKeyConverterTest.java

@@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat;
 import static google.registry.model.poll.PollMessageExternalKeyConverter.makePollMessageExternalId;
 import static google.registry.model.poll.PollMessageExternalKeyConverter.parsePollMessageExternalId;
 import static google.registry.testing.DatabaseHelper.createTld;
-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;
@@ -83,23 +82,6 @@ public class PollMessageExternalKeyConverterTest {
     assertVKeysEqual(parsePollMessageExternalId("5-2007"), pollMessage.createVKey());
   }
 
-  @Test
-  void testSuccess_contact() {
-    historyEntry =
-        persistResource(
-            DatabaseHelper.createHistoryEntryForEppResource(persistActiveContact("tim")));
-    PollMessage.OneTime pollMessage =
-        persistResource(
-            new PollMessage.OneTime.Builder()
-                .setRegistrarId("TheRegistrar")
-                .setEventTime(clock.nowUtc())
-                .setMsg("Test poll message")
-                .setHistoryEntry(historyEntry)
-                .build());
-    assertThat(makePollMessageExternalId(pollMessage)).isEqualTo("7-2007");
-    assertVKeysEqual(parsePollMessageExternalId("7-2007"), pollMessage.createVKey());
-  }
-
   @Test
   void testSuccess_host() {
     historyEntry =

core/src/test/java/google/registry/model/reporting/HistoryEntryTest.java

@@ -18,7 +18,6 @@ import static com.google.common.truth.Truth.assertThat;
 import static google.registry.model.ImmutableObjectSubject.assertAboutImmutableObjects;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
 import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.persistActiveContact;
 import static google.registry.testing.DatabaseHelper.persistActiveDomain;
 import static google.registry.testing.DatabaseHelper.persistResource;
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -26,13 +25,12 @@ import static org.junit.Assert.assertThrows;
 
 import com.google.common.collect.ImmutableSet;
 import google.registry.model.EntityTestCase;
-import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.Period;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.reporting.DomainTransactionRecord.TransactionReportField;
+import google.registry.model.reporting.HistoryEntry.Type;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -40,14 +38,13 @@ import org.junit.jupiter.api.Test;
 /** Unit tests for {@link HistoryEntry}. */
 class HistoryEntryTest extends EntityTestCase {
 
+  private Domain domain;
   private DomainHistory domainHistory;
-  private Contact contact;
 
   @BeforeEach
   void setUp() {
     createTld("foobar");
-    Domain domain = persistActiveDomain("foo.foobar");
-    contact = persistActiveContact("someone");
+    domain = persistActiveDomain("foo.foobar");
     DomainTransactionRecord transactionRecord =
         new DomainTransactionRecord.Builder()
             .setTld("foobar")
@@ -91,12 +88,12 @@ class HistoryEntryTest extends EntityTestCase {
         assertThrows(
             IllegalArgumentException.class,
             () ->
-                new ContactHistory.Builder()
+                new DomainHistory.Builder()
                     .setRevisionId(5L)
                     .setModificationTime(DateTime.parse("1985-07-12T22:30:00Z"))
                     .setRegistrarId("TheRegistrar")
                     .setReason("Reason")
-                    .setType(HistoryEntry.Type.CONTACT_CREATE)
+                    .setType(Type.DOMAIN_CREATE)
                     .build());
     assertThat(thrown).hasMessageThat().isEqualTo("EPP resource must be specified");
   }
@@ -107,10 +104,10 @@ class HistoryEntryTest extends EntityTestCase {
         assertThrows(
             IllegalArgumentException.class,
             () ->
-                new ContactHistory.Builder()
-                    .setContact(contact)
+                new DomainHistory.Builder()
                     .setRevisionId(5L)
-                    .setModificationTime(DateTime.parse("1985-07-12T22:30:00Z"))
+                    .setDomain(domain)
+                    .setModificationTime(DateTime.parse("1985-07-12T22:30.00Z"))
                     .setRegistrarId("TheRegistrar")
                     .setReason("Reason")
                     .build());
@@ -123,12 +120,12 @@ class HistoryEntryTest extends EntityTestCase {
         assertThrows(
             IllegalArgumentException.class,
             () ->
-                new ContactHistory.Builder()
-                    .setContact(contact)
+                new DomainHistory.Builder()
                     .setRevisionId(5L)
-                    .setType(HistoryEntry.Type.CONTACT_CREATE)
+                    .setDomain(domain)
+                    .setType(Type.DOMAIN_CREATE)
                     .setRegistrarId("TheRegistrar")
-                    .setReason("Reason")
+                    .setReason("reason")
                     .build());
     assertThat(thrown).hasMessageThat().isEqualTo("Modification time must be specified");
   }
@@ -139,11 +136,11 @@ class HistoryEntryTest extends EntityTestCase {
         assertThrows(
             IllegalArgumentException.class,
             () ->
-                new ContactHistory.Builder()
+                new DomainHistory.Builder()
                     .setRevisionId(5L)
-                    .setContact(contact)
-                    .setType(HistoryEntry.Type.CONTACT_CREATE)
-                    .setModificationTime(DateTime.parse("1985-07-12T22:30:00Z"))
+                    .setDomain(domain)
+                    .setType(Type.DOMAIN_CREATE)
+                    .setModificationTime(DateTime.parse("1985-07-12T22:30.00Z"))
                     .setReason("Reason")
                     .build());
     assertThat(thrown).hasMessageThat().isEqualTo("Registrar ID must be specified");
@@ -155,11 +152,11 @@ class HistoryEntryTest extends EntityTestCase {
         assertThrows(
             IllegalArgumentException.class,
             () ->
-                new ContactHistory.Builder()
-                    .setContact(contact)
+                new DomainHistory.Builder()
                     .setRevisionId(5L)
-                    .setType(HistoryEntry.Type.SYNTHETIC)
-                    .setModificationTime(DateTime.parse("1985-07-12T22:30:00Z"))
+                    .setDomain(domain)
+                    .setType(Type.SYNTHETIC)
+                    .setModificationTime(DateTime.parse("1985-07-12T22:30.00Z"))
                     .setRegistrarId("TheRegistrar")
                     .setReason("Reason")
                     .setRequestedByRegistrar(true)

core/src/test/java/google/registry/mosapi/MosApiMetricsTest.java

@@ -0,0 +1,236 @@
+// 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.mosapi;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.google.api.services.monitoring.v3.Monitoring;
+import com.google.api.services.monitoring.v3.model.CreateTimeSeriesRequest;
+import com.google.api.services.monitoring.v3.model.MetricDescriptor;
+import com.google.api.services.monitoring.v3.model.TimeSeries;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import google.registry.mosapi.MosApiModels.ServiceStatus;
+import google.registry.mosapi.MosApiModels.TldServiceState;
+import google.registry.request.lock.LockHandler;
+import google.registry.testing.FakeClock;
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.Callable;
+import org.joda.time.DateTime;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+
+/** Unit tests for {@link MosApiMetrics}. */
+public class MosApiMetricsTest {
+  private static final String PROJECT_ID = "domain-registry-test";
+
+  private final Monitoring monitoringClient = mock(Monitoring.class);
+  private final Monitoring.Projects projects = mock(Monitoring.Projects.class);
+  private final LockHandler lockHandler = mock(LockHandler.class);
+  private final Monitoring.Projects.TimeSeries timeSeriesResource =
+      mock(Monitoring.Projects.TimeSeries.class);
+  private final Monitoring.Projects.TimeSeries.Create createRequest =
+      mock(Monitoring.Projects.TimeSeries.Create.class);
+
+  // Mocks for Metric Descriptors
+  private final Monitoring.Projects.MetricDescriptors metricDescriptorsResource =
+      mock(Monitoring.Projects.MetricDescriptors.class);
+  private final Monitoring.Projects.MetricDescriptors.Create createDescriptorRequest =
+      mock(Monitoring.Projects.MetricDescriptors.Create.class);
+
+  // Fixed Clock for deterministic testing
+  private final FakeClock clock = new FakeClock(DateTime.parse("2026-01-01T12:00:00Z"));
+  private MosApiMetrics mosApiMetrics;
+
+  @BeforeEach
+  void setUp() throws IOException, NoSuchFieldException, IllegalAccessException {
+    MosApiMetrics.isDescriptorInitialized.set(false);
+    when(monitoringClient.projects()).thenReturn(projects);
+    when(projects.timeSeries()).thenReturn(timeSeriesResource);
+    when(timeSeriesResource.create(anyString(), any(CreateTimeSeriesRequest.class)))
+        .thenReturn(createRequest);
+
+    // Setup for Metric Descriptors
+    when(projects.metricDescriptors()).thenReturn(metricDescriptorsResource);
+    when(metricDescriptorsResource.create(anyString(), any(MetricDescriptor.class)))
+        .thenReturn(createDescriptorRequest);
+    when(lockHandler.executeWithLocks(any(Callable.class), any(), any(), any()))
+        .thenAnswer(
+            invocation -> {
+              ((Callable<?>) invocation.getArgument(0)).call();
+              return true;
+            });
+    mosApiMetrics = new MosApiMetrics(monitoringClient, PROJECT_ID, clock, lockHandler);
+  }
+
+  @Test
+  void testRecordStates_lazilyInitializesMetricDescriptors() throws IOException {
+    TldServiceState state = createTldState("test.tld", "UP", "UP");
+
+    mosApiMetrics.recordStates(ImmutableList.of(state));
+
+    ArgumentCaptor<MetricDescriptor> captor = ArgumentCaptor.forClass(MetricDescriptor.class);
+
+    verify(metricDescriptorsResource, times(3))
+        .create(eq("projects/" + PROJECT_ID), captor.capture());
+
+    List<MetricDescriptor> descriptors = captor.getAllValues();
+
+    // Verify TLD Status Descriptor
+    MetricDescriptor tldStatus =
+        descriptors.stream()
+            .filter(d -> d.getType().endsWith("tld_status"))
+            .findFirst()
+            .orElseThrow();
+    assertThat(tldStatus.getMetricKind()).isEqualTo("GAUGE");
+    assertThat(tldStatus.getValueType()).isEqualTo("INT64");
+
+    // Verify Service Status Descriptor
+    MetricDescriptor serviceStatus =
+        descriptors.stream()
+            .filter(d -> d.getType().endsWith("service_status"))
+            .findFirst()
+            .orElseThrow();
+    assertThat(serviceStatus.getMetricKind()).isEqualTo("GAUGE");
+    assertThat(serviceStatus.getValueType()).isEqualTo("INT64");
+
+    // Verify Emergency Usage Descriptor
+    MetricDescriptor emergencyUsage =
+        descriptors.stream()
+            .filter(d -> d.getType().endsWith("emergency_usage"))
+            .findFirst()
+            .orElseThrow();
+    assertThat(emergencyUsage.getMetricKind()).isEqualTo("GAUGE");
+    assertThat(emergencyUsage.getValueType()).isEqualTo("DOUBLE");
+  }
+
+  @Test
+  void testRecordStates_mapsStatusesToCorrectValues() throws IOException {
+    TldServiceState stateUp = createTldState("tld-up", "UP", "UP");
+    TldServiceState stateDown = createTldState("tld-down", "DOWN", "DOWN");
+    TldServiceState stateMaint = createTldState("tld-maint", "UP-INCONCLUSIVE", "DISABLED");
+
+    mosApiMetrics.recordStates(ImmutableList.of(stateUp, stateDown, stateMaint));
+
+    ArgumentCaptor<CreateTimeSeriesRequest> captor =
+        ArgumentCaptor.forClass(CreateTimeSeriesRequest.class);
+    verify(timeSeriesResource).create(eq("projects/" + PROJECT_ID), captor.capture());
+
+    List<TimeSeries> pushedSeries = captor.getValue().getTimeSeries();
+
+    // Verify TLD Status Mappings: 1 (UP), 0 (DOWN), 2 (UP-INCONCLUSIVE)
+    assertThat(getValueFor(pushedSeries, "tld-up", "tld_status")).isEqualTo(1);
+    assertThat(getValueFor(pushedSeries, "tld-down", "tld_status")).isEqualTo(0);
+    assertThat(getValueFor(pushedSeries, "tld-maint", "tld_status")).isEqualTo(2);
+
+    // Verify Service Status Mappings: UP -> 1, DOWN -> 0, DISABLED -> 2
+    assertThat(getValueFor(pushedSeries, "tld-up", "service_status")).isEqualTo(1);
+    assertThat(getValueFor(pushedSeries, "tld-down", "service_status")).isEqualTo(0);
+    assertThat(getValueFor(pushedSeries, "tld-maint", "service_status")).isEqualTo(2);
+
+    // 3. Verify Emergency Usage (DOUBLE)
+    assertThat(getValueFor(pushedSeries, "tld-up", "emergency_usage").doubleValue())
+        .isEqualTo(50.0);
+    assertThat(getValueFor(pushedSeries, "tld-down", "emergency_usage").doubleValue())
+        .isEqualTo(50.0);
+    assertThat(getValueFor(pushedSeries, "tld-maint", "emergency_usage").doubleValue())
+        .isEqualTo(50.0);
+  }
+
+  @Test
+  void testRecordStates_partitionsTimeSeries_atLimit() throws IOException {
+    ImmutableList<TldServiceState> largeBatch =
+        java.util.stream.IntStream.range(0, 70)
+            .mapToObj(i -> createTldState("tld-" + i, "UP", "UP"))
+            .collect(ImmutableList.toImmutableList());
+    mosApiMetrics.recordStates(largeBatch);
+
+    verify(timeSeriesResource, times(2))
+        .create(eq("projects/" + PROJECT_ID), any(CreateTimeSeriesRequest.class));
+  }
+
+  @Test
+  void testMetricStructure_containsExpectedLabelsAndResource() throws IOException {
+    TldServiceState state = createTldState("example.tld", "UP", "UP");
+    mosApiMetrics.recordStates(ImmutableList.of(state));
+
+    ArgumentCaptor<CreateTimeSeriesRequest> captor =
+        ArgumentCaptor.forClass(CreateTimeSeriesRequest.class);
+    verify(timeSeriesResource).create(anyString(), captor.capture());
+
+    TimeSeries ts = captor.getValue().getTimeSeries().get(0);
+
+    assertThat(ts.getMetric().getType()).startsWith("custom.googleapis.com/mosapi/");
+    assertThat(ts.getMetric().getLabels()).containsEntry("tld", "example.tld");
+
+    assertThat(ts.getResource().getType()).isEqualTo("global");
+    assertThat(ts.getResource().getLabels()).containsEntry("project_id", PROJECT_ID);
+
+    // Verify that the interval matches our fixed clock
+    assertThat(ts.getPoints().get(0).getInterval().getEndTime()).isEqualTo("2026-01-01T12:00:00Z");
+  }
+
+  /** Extracts the numeric value for a specific TLD and metric type from a list of TimeSeries. */
+  private Number getValueFor(List<TimeSeries> seriesList, String tld, String metricSuffix) {
+    String fullMetric = "custom.googleapis.com/mosapi/" + metricSuffix;
+    return seriesList.stream()
+        .filter(ts -> tld.equals(ts.getMetric().getLabels().get("tld")))
+        .filter(ts -> ts.getMetric().getType().equals(fullMetric))
+        .findFirst()
+        .map(
+            ts -> {
+              Double dVal = ts.getPoints().get(0).getValue().getDoubleValue();
+              if (dVal != null) {
+                return (Number) dVal;
+              }
+              // Fallback to Int64.
+              return (Number) ts.getPoints().get(0).getValue().getInt64Value();
+            })
+        .get();
+  }
+
+  @Test
+  void testRecordStates_skipsInitialization_ifLockNotAcquired() throws IOException {
+    when(lockHandler.executeWithLocks(any(Callable.class), any(), any(), any())).thenReturn(false);
+
+    TldServiceState state = createTldState("test.tld", "UP", "UP");
+    mosApiMetrics.recordStates(ImmutableList.of(state));
+
+    verify(metricDescriptorsResource, never()).create(anyString(), any());
+  }
+
+  /** Mocks a TldServiceState with a single service status. */
+  private TldServiceState createTldState(String tld, String tldStatus, String serviceStatus) {
+    ServiceStatus sStatus = mock(ServiceStatus.class);
+    when(sStatus.status()).thenReturn(serviceStatus);
+    when(sStatus.emergencyThreshold()).thenReturn(50.0);
+
+    TldServiceState state = mock(TldServiceState.class);
+    when(state.tld()).thenReturn(tld);
+    when(state.status()).thenReturn(tldStatus);
+    when(state.serviceStatuses()).thenReturn(ImmutableMap.of("dns", sStatus));
+
+    return state;
+  }
+}

core/src/test/java/google/registry/mosapi/MosApiStateServiceTest.java

@@ -169,4 +169,23 @@ class MosApiStateServiceTest {
                         && states.stream()
                             .anyMatch(s -> s.tld().equals("tld1") && s.status().equals("Up"))));
   }
+
+  @Test
+  void testTriggerMetrics_filtersOutInvalidContractStates() throws Exception {
+    // 1. Valid State
+    TldServiceState validState = new TldServiceState("tld1", 1L, "Up", ImmutableMap.of());
+
+    // 2. Invalid State (Status is NULL)
+    // We instantiate it directly to simulate a bad response object.
+    TldServiceState invalidState = new TldServiceState("tld2", 2L, null, ImmutableMap.of());
+
+    when(client.getTldServiceState("tld1")).thenReturn(validState);
+    when(client.getTldServiceState("tld2")).thenReturn(invalidState);
+
+    service.triggerMetricsForAllServiceStateSummaries();
+
+    // Verify: Only the valid state (tld1) is passed to recordStates
+    verify(metrics)
+        .recordStates(argThat(states -> states.size() == 1 && states.get(0).tld().equals("tld1")));
+  }
 }

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/DomainToXjcConverterTest.java

@@ -28,17 +28,12 @@ import static google.registry.xjc.rgp.XjcRgpStatusValueType.TRANSFER_PERIOD;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.joda.money.CurrencyUnit.USD;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.net.InetAddresses;
 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.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.DomainAuthInfo;
@@ -73,7 +68,6 @@ import google.registry.xjc.rgp.XjcRgpStatusType;
 import google.registry.xjc.secdns.XjcSecdnsDsDataType;
 import google.registry.xml.XmlException;
 import java.io.ByteArrayOutputStream;
-import java.util.Optional;
 import org.joda.money.Money;
 import org.joda.time.DateTime;
 import org.junit.jupiter.api.BeforeEach;
@@ -109,7 +103,7 @@ public class DomainToXjcConverterTest {
     assertThat(
             bean.getContacts().stream()
                 .map(input -> String.format("%s %s", input.getType().toString(), input.getValue())))
-        .containsExactly("ADMIN 5372808-IRL", "TECH 5372808-TRL");
+        .containsExactly("ADMIN contact1234", "TECH contact1234");
 
     assertThat(bean.getCrDate()).isEqualTo(DateTime.parse("1900-01-01T00:00:00Z"));
 
@@ -138,7 +132,7 @@ public class DomainToXjcConverterTest {
     //    name used to generate the IDN variant.
     // TODO(b/26125498): bean.getOriginalName()
 
-    assertThat(bean.getRegistrant()).isEqualTo("5372808-ERL");
+    assertThat(bean.getRegistrant()).isEqualTo("contact1234");
 
     // o  Zero or more OPTIONAL <rgpStatus> element to represent
     //    "pendingDelete" sub-statuses, including "redemptionPeriod",
@@ -264,26 +258,6 @@ public class DomainToXjcConverterTest {
         domain
             .asBuilder()
             .setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("secret")))
-            .setContacts(
-                ImmutableSet.of(
-                    DesignatedContact.create(
-                        DesignatedContact.Type.ADMIN,
-                        makeContact(
-                                clock,
-                                "10-Q9JYB4C",
-                                "5372808-IRL",
-                                "be that word our sign in parting",
-                                "BOFH@cat.みんな")
-                            .createVKey()),
-                    DesignatedContact.create(
-                        DesignatedContact.Type.TECH,
-                        makeContact(
-                                clock,
-                                "11-Q9JYB4C",
-                                "5372808-TRL",
-                                "bird or fiend!? i shrieked upstarting",
-                                "bog@cat.みんな")
-                            .createVKey())))
             .setCreationRegistrarId("TheRegistrar")
             .setCreationTimeForTest(DateTime.parse("1900-01-01T00:00:00Z"))
             .setPersistedCurrentSponsorRegistrarId("TheRegistrar")
@@ -298,15 +272,6 @@ public class DomainToXjcConverterTest {
                     makeHost(clock, "3-Q9JYB4C", "bird.or.devil.みんな", "1.2.3.4").createVKey(),
                     makeHost(clock, "4-Q9JYB4C", "ns2.cat.みんな", "bad:f00d:cafe::15:beef")
                         .createVKey()))
-            .setRegistrant(
-                Optional.of(
-                    makeContact(
-                            clock,
-                            "12-Q9JYB4C",
-                            "5372808-ERL",
-                            "(◕‿◕) nevermore",
-                            "prophet@evil.みんな")
-                        .createVKey()))
             .setRegistrationExpirationTime(DateTime.parse("1930-01-01T00:00:00Z"))
             .setGracePeriods(
                 ImmutableSet.of(
@@ -404,37 +369,6 @@ public class DomainToXjcConverterTest {
     return persistResource(domain);
   }
 
-  private static Contact makeContact(
-      FakeClock clock, String repoId, String id, String name, String email) {
-    clock.advanceOneMilli();
-    return persistEppResource(
-        new Contact.Builder()
-            .setContactId(id)
-            .setEmailAddress(email)
-            .setPersistedCurrentSponsorRegistrarId("TheRegistrar")
-            .setCreationRegistrarId("TheRegistrar")
-            .setCreationTimeForTest(END_OF_TIME)
-            .setInternationalizedPostalInfo(
-                new PostalInfo.Builder()
-                    .setType(PostalInfo.Type.INTERNATIONALIZED)
-                    .setName(name)
-                    .setOrg("SINNERS INCORPORATED")
-                    .setAddress(
-                        new ContactAddress.Builder()
-                            .setStreet(ImmutableList.of("123 Example Boulevard"))
-                            .setCity("KOKOMO")
-                            .setState("BM")
-                            .setZip("31337")
-                            .setCountryCode("US")
-                            .build())
-                    .build())
-            .setRepoId(repoId)
-            .setVoiceNumber(
-                new ContactPhoneNumber.Builder().setPhoneNumber("+1.2126660420").build())
-            .setFaxNumber(new ContactPhoneNumber.Builder().setPhoneNumber("+1.2126660421").build())
-            .build());
-  }
-
   private static Host makeHost(FakeClock clock, String repoId, String fqhn, String ip) {
     clock.advanceOneMilli();
     return persistEppResource(

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,8 +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.getContactAutomaticTransferLength;
+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;
@@ -76,7 +75,6 @@ import google.registry.model.console.User;
 import google.registry.model.console.UserRoles;
 import google.registry.model.contact.Contact;
 import google.registry.model.contact.ContactAuthInfo;
-import google.registry.model.contact.ContactHistory;
 import google.registry.model.domain.DesignatedContact;
 import google.registry.model.domain.DesignatedContact.Type;
 import google.registry.model.domain.Domain;
@@ -152,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) {
@@ -203,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) {
@@ -536,53 +534,6 @@ public final class DatabaseHelper {
         .build();
   }
 
-  public static Contact persistContactWithPendingTransfer(
-      Contact contact, DateTime requestTime, DateTime expirationTime, DateTime now) {
-    ContactHistory historyEntryContactTransfer =
-        persistResource(
-            new ContactHistory.Builder()
-                .setType(HistoryEntry.Type.CONTACT_TRANSFER_REQUEST)
-                .setContact(persistResource(contact))
-                .setModificationTime(now)
-                .setRegistrarId(contact.getCurrentSponsorRegistrarId())
-                .build());
-    return persistResource(
-        contact
-            .asBuilder()
-            .setPersistedCurrentSponsorRegistrarId("TheRegistrar")
-            .addStatusValue(StatusValue.PENDING_TRANSFER)
-            .setTransferData(
-                createContactTransferDataBuilder(requestTime, expirationTime)
-                    .setPendingTransferExpirationTime(now.plus(getContactAutomaticTransferLength()))
-                    .setServerApproveEntities(
-                        historyEntryContactTransfer.getRepoId(),
-                        historyEntryContactTransfer.getRevisionId(),
-                        ImmutableSet.of(
-                            // Pretend it's 3 days since the request
-                            persistResource(
-                                    createPollMessageForImplicitTransfer(
-                                        contact,
-                                        historyEntryContactTransfer,
-                                        "NewRegistrar",
-                                        requestTime,
-                                        expirationTime,
-                                        null))
-                                .createVKey(),
-                            persistResource(
-                                    createPollMessageForImplicitTransfer(
-                                        contact,
-                                        historyEntryContactTransfer,
-                                        "TheRegistrar",
-                                        requestTime,
-                                        expirationTime,
-                                        null))
-                                .createVKey()))
-                    .setTransferRequestTrid(
-                        Trid.create("transferClient-trid", "transferServer-trid"))
-                    .build())
-            .build());
-  }
-
   public static Domain persistDomainWithDependentResources(
       String label,
       String tld,
@@ -973,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/domain_create_missing_contact_type.xml

@@ -1,20 +0,0 @@
-<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">2</domain:period>
-        <domain:ns>
-          <domain:hostObj>ns1.example.net</domain:hostObj>
-          <domain:hostObj>ns2.example.net</domain:hostObj>
-        </domain:ns>
-        <domain:contact>sh8013</domain:contact>
-        <domain:authInfo>
-          <domain:pw>2fooBAR</domain:pw>
-        </domain:authInfo>
-      </domain:create>
-    </create>
-    <clTRID>ABC-12345</clTRID>
-  </command>
-</epp>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request.xml

@@ -6,7 +6,7 @@
         <domain:name>example.tld</domain:name>
         <domain:period unit="y">1</domain:period>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
+          <domain:pw>fooBAR</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request_allocation_token.xml

@@ -6,7 +6,7 @@
         <domain:name>example.tld</domain:name>
         <domain:period unit="y">1</domain:period>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
+          <domain:pw>fooBAR</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request_contact_auth_info_failure.xml

@@ -0,0 +1,15 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <command>
+    <transfer op="request">
+      <domain:transfer
+       xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
+        <domain:name>example.tld</domain:name>
+        <domain:period unit="y">1</domain:period>
+        <domain:authInfo>
+          <domain:pw roid="2-ROID">2fooBAR</domain:pw>
+        </domain:authInfo>
+      </domain:transfer>
+    </transfer>
+    <clTRID>ABC-12345</clTRID>
+  </command>
+</epp>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee.xml

@@ -6,7 +6,7 @@
         <domain:name>%DOMAIN%</domain:name>
         <domain:period unit="y">%YEARS%</domain:period>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
+          <domain:pw>fooBAR</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_applied.xml

@@ -6,7 +6,7 @@
         <domain:name>example.tld</domain:name>
         <domain:period unit="y">1</domain:period>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
+          <domain:pw>fooBAR</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_bad_scale.xml

@@ -6,7 +6,7 @@
         <domain:name>example.tld</domain:name>
         <domain:period unit="y">1</domain:period>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
+          <domain:pw>fooBAR</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_defaults.xml

@@ -6,7 +6,7 @@
         <domain:name>example.tld</domain:name>
         <domain:period unit="y">1</domain:period>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
+          <domain:pw>fooBAR</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_grace_period.xml

@@ -6,7 +6,7 @@
         <domain:name>example.tld</domain:name>
         <domain:period unit="y">1</domain:period>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
+          <domain:pw>fooBAR</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request_fee_refundable.xml

@@ -6,7 +6,7 @@
         <domain:name>example.tld</domain:name>
         <domain:period unit="y">1</domain:period>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
+          <domain:pw>fooBAR</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request_missing_period.xml

@@ -5,7 +5,7 @@
        xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
         <domain:name>example.tld</domain:name>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
+          <domain:pw>fooBAR</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request_months.xml

@@ -6,7 +6,7 @@
         <domain:name>example.tld</domain:name>
         <domain:period unit="m">1</domain:period>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
+          <domain:pw>fooBAR</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request_premium.xml

@@ -6,7 +6,7 @@
         <domain:name>rich.example</domain:name>
         <domain:period unit="y">1</domain:period>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
+          <domain:pw>fooBAR</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>

core/src/test/resources/google/registry/flows/domain/domain_transfer_request_separate_fees.xml

@@ -6,7 +6,7 @@
         <domain:name>%DOMAIN%</domain:name>
         <domain:period unit="y">%YEARS%</domain:period>
         <domain:authInfo>
-          <domain:pw roid="JD1234-REP">2fooBAR</domain:pw>
+          <domain:pw>fooBAR</domain:pw>
         </domain:authInfo>
       </domain:transfer>
     </transfer>

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>