Re-enable old fee extensions in sandbox (#2939)

Now that we've passed the RST testing (or at least the EPP portion of
it) we are no longer bound by the restriction to only use the fee
extension version 1.0 on sandbox.

For now, in order to avoid changing prod behavior, this does not enable
advertisement of the fee extension version 1.0 in production. We can
change this at any point in the future.

core/src/main/java/google/registry/beam/rde/RdePipeline.java

@@ -50,8 +50,6 @@ import google.registry.config.CredentialModule;
 import google.registry.config.RegistryConfig.ConfigModule;
 import google.registry.gcs.GcsUtils;
 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;
@@ -73,7 +71,6 @@ import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import java.io.IOException;
 import java.io.Serializable;
-import java.util.HashSet;
 import org.apache.beam.sdk.Pipeline;
 import org.apache.beam.sdk.PipelineResult;
 import org.apache.beam.sdk.coders.KvCoder;
@@ -138,25 +135,21 @@ import org.joda.time.DateTime;
  * pairs of (contact/host repo ID: pending deposit) for all RDE pending deposits for further
  * processing.
  *
- * <h3>{@link Contact}</h3>
- *
- * We first join most recent contact histories, represented by (contact repo ID: contact history
- * revision ID) pairs, with referenced contacts, represented by (contact repo ID: pending deposit)
- * pairs, on the contact repo ID, to remove unreferenced contact histories. Contact resources are
- * then loaded from the remaining referenced contact histories, and marshalled into (pending
- * deposit: deposit fragment) pairs.
- *
  * <h3>{@link Host}</h3>
  *
- * Similar to {@link Contact}, we join the most recent host history with referenced hosts to find
- * most recent referenced hosts. For external hosts we do the same treatment as we did on contacts
- * and obtain the (pending deposit: deposit fragment) pairs. For subordinate hosts, we need to find
- * the superordinate domain in order to properly handle pending transfer in the deposit as well. So
- * we first find the superordinate domain repo ID from the host and join the (superordinate domain
- * repo ID: (subordinate host repo ID: (pending deposit: revision ID))) pair with the (domain repo
- * ID: revision ID) pair obtained from the domain history query in order to map the host at
- * watermark to the domain at watermark. We then proceed to create the (pending deposit: deposit
- * fragment) pair for subordinate hosts using the added domain information.
+ * <p>We first join most recent host histories, represented by (host repo ID: host history revision
+ * ID) pairs, with referenced hosts, represented by (host repo ID: pending deposit) pairs, on the
+ * host repo ID, to remove unreferenced host histories. Host resources are then loaded from the
+ * remaining referenced host histories, and marshalled into (pending deposit: deposit fragment)
+ * pairs.
+ *
+ * <p>For subordinate hosts, we need to find the superordinate domain in order to properly handle
+ * pending transfer in the deposit as well. So we first find the superordinate domain repo ID from
+ * the host and join the (superordinate domain repo ID: (subordinate host repo ID: (pending deposit:
+ * revision ID))) pair with the (domain repo ID: revision ID) pair obtained from the domain history
+ * query in order to map the host at watermark to the domain at watermark. We then proceed to create
+ * the (pending deposit: deposit fragment) pair for subordinate hosts using the added domain
+ * information.
  *
  * <h2>Processing {@link DepositFragment}</h2>
  *
@@ -230,9 +223,6 @@ public class RdePipeline implements Serializable {
     PCollection<KV<String, Long>> domainHistories =
         getMostRecentHistoryEntries(pipeline, DomainHistory.class);
 
-    PCollection<KV<String, Long>> contactHistories =
-        getMostRecentHistoryEntries(pipeline, ContactHistory.class);
-
     PCollection<KV<String, Long>> hostHistories =
         getMostRecentHistoryEntries(pipeline, HostHistory.class);
 
@@ -241,10 +231,6 @@ public class RdePipeline implements Serializable {
     PCollection<KV<PendingDeposit, DepositFragment>> domainFragments =
         processedDomainHistories.get(DOMAIN_FRAGMENTS);
 
-    PCollection<KV<PendingDeposit, DepositFragment>> contactFragments =
-        processContactHistories(
-            processedDomainHistories.get(REFERENCED_CONTACTS), contactHistories);
-
     PCollectionTuple processedHosts =
         processHostHistories(processedDomainHistories.get(REFERENCED_HOSTS), hostHistories);
 
@@ -256,7 +242,6 @@ public class RdePipeline implements Serializable {
 
     return PCollectionList.of(registrarFragments)
         .and(domainFragments)
-        .and(contactFragments)
         .and(externalHostFragments)
         .and(subordinateHostFragments)
         .apply(
@@ -437,7 +422,6 @@ public class RdePipeline implements Serializable {
   private PCollectionTuple processDomainHistories(PCollection<KV<String, Long>> domainHistories) {
     Counter activeDomainCounter = Metrics.counter("RDE", "ActiveDomainBase");
     Counter domainFragmentCounter = Metrics.counter("RDE", "DomainFragment");
-    Counter referencedContactCounter = Metrics.counter("RDE", "ReferencedContact");
     Counter referencedHostCounter = Metrics.counter("RDE", "ReferencedHost");
     return domainHistories.apply(
         "Map DomainHistory to DepositFragment " + "and emit referenced Contact and Host",
@@ -463,19 +447,8 @@ public class RdePipeline implements Serializable {
                                       KV.of(
                                           pendingDeposit,
                                           marshaller.marshalDomain(domain, pendingDeposit.mode())));
-                              // Contacts and hosts are only deposited in RDE, not BRDA.
+                              // Hosts are only deposited in RDE, not BRDA.
                               if (pendingDeposit.mode() == RdeMode.FULL) {
-                                HashSet<Serializable> contacts = new HashSet<>();
-                                domain.getAdminContact().ifPresent(c -> contacts.add(c.getKey()));
-                                domain.getTechContact().ifPresent(c -> contacts.add(c.getKey()));
-                                domain.getRegistrant().ifPresent(c -> contacts.add(c.getKey()));
-                                domain.getBillingContact().ifPresent(c -> contacts.add(c.getKey()));
-                                referencedContactCounter.inc(contacts.size());
-                                contacts.forEach(
-                                    contactRepoId ->
-                                        receiver
-                                            .get(REFERENCED_CONTACTS)
-                                            .output(KV.of((String) contactRepoId, pendingDeposit)));
                                 if (domain.getNsHosts() != null) {
                                   referencedHostCounter.inc(domain.getNsHosts().size());
                                   domain
@@ -497,38 +470,6 @@ public class RdePipeline implements Serializable {
                 DOMAIN_FRAGMENTS, TupleTagList.of(REFERENCED_CONTACTS).and(REFERENCED_HOSTS)));
   }
 
-  private PCollection<KV<PendingDeposit, DepositFragment>> processContactHistories(
-      PCollection<KV<String, PendingDeposit>> referencedContacts,
-      PCollection<KV<String, Long>> contactHistories) {
-    Counter contactFragmentCounter = Metrics.counter("RDE", "ContactFragment");
-    return removeUnreferencedResource(referencedContacts, contactHistories, Contact.class)
-        .apply(
-            "Map Contact to DepositFragment",
-            FlatMapElements.into(
-                    kvs(
-                        TypeDescriptor.of(PendingDeposit.class),
-                        TypeDescriptor.of(DepositFragment.class)))
-                .via(
-                    (KV<String, CoGbkResult> kv) -> {
-                      Contact contact =
-                          (Contact)
-                              loadResourceByHistoryEntryId(
-                                  ContactHistory.class,
-                                  kv.getKey(),
-                                  kv.getValue().getAll(REVISION_ID));
-                      DepositFragment fragment = marshaller.marshalContact(contact);
-                      ImmutableSet<KV<PendingDeposit, DepositFragment>> fragments =
-                          Streams.stream(kv.getValue().getAll(PENDING_DEPOSIT))
-                              // The same contact could be used by multiple domains, therefore
-                              // matched to the same pending deposit multiple times.
-                              .distinct()
-                              .map(pendingDeposit -> KV.of(pendingDeposit, fragment))
-                              .collect(toImmutableSet());
-                      contactFragmentCounter.inc(fragments.size());
-                      return fragments;
-                    }));
-  }
-
   private PCollectionTuple processHostHistories(
       PCollection<KV<String, PendingDeposit>> referencedHosts,
       PCollection<KV<String, Long>> hostHistories) {

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

@@ -17,6 +17,7 @@ package google.registry.flows.host;
 import static google.registry.flows.domain.DomainFlowUtils.validateFirstLabel;
 import static google.registry.model.EppResourceUtils.isActive;
 import static google.registry.model.tld.Tlds.findTldForName;
+import static google.registry.util.DomainNameUtils.canonicalizeHostname;
 import static google.registry.util.PreconditionsUtils.checkArgumentNotNull;
 import static java.util.stream.Collectors.joining;
 
@@ -34,7 +35,6 @@ import google.registry.flows.EppException.StatusProhibitsOperationException;
 import google.registry.model.ForeignKeyUtils;
 import google.registry.model.domain.Domain;
 import google.registry.model.eppcommon.StatusValue;
-import google.registry.util.Idn;
 import java.net.InetAddress;
 import java.util.Optional;
 import org.joda.time.DateTime;
@@ -57,7 +57,7 @@ public class HostFlowUtils {
       throw new HostNameNotLowerCaseException(hostNameLowerCase);
     }
     try {
-      String hostNamePunyCoded = Idn.toASCII(name);
+      String hostNamePunyCoded = canonicalizeHostname(name);
       if (!name.equals(hostNamePunyCoded)) {
         throw new HostNameNotPunyCodedException(hostNamePunyCoded);
       }

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

@@ -23,7 +23,6 @@ import com.google.common.collect.ImmutableSet;
 import google.registry.model.ImmutableObject;
 import google.registry.model.eppinput.EppInput;
 import google.registry.model.eppoutput.EppOutput;
-import google.registry.util.NonFinalForTesting;
 import google.registry.util.RegistryEnvironment;
 import google.registry.xml.ValidationMode;
 import google.registry.xml.XmlException;
@@ -61,35 +60,20 @@ public class EppXmlTransformer  {
   // XML schemas that should not be used in production (yet)
   private static final ImmutableSet<String> NON_PROD_SCHEMAS = ImmutableSet.of("fee-std-v1.xsd");
 
-  // XML schemas that should only be used in production (for backcompat)
-  private static final ImmutableSet<String> ONLY_PROD_SCHEMAS =
-      ImmutableSet.of("fee06.xsd", "fee11.xsd", "fee12.xsd");
-
-  // TODO(gbrodman): make this final when we can actually remove the old fee extensions and aren't
-  // relying on switching by environment
-  @NonFinalForTesting
-  private static XmlTransformer INPUT_TRANSFORMER =
+  private static final XmlTransformer INPUT_TRANSFORMER =
       new XmlTransformer(getSchemas(), EppInput.class);
 
-  // TODO(gbrodman): make this final when we can actually remove the old fee extensions and aren't
-  // relying on switching by environment
-  @NonFinalForTesting
-  private static XmlTransformer OUTPUT_TRANSFORMER =
+  private static final XmlTransformer OUTPUT_TRANSFORMER =
       new XmlTransformer(getSchemas(), EppOutput.class);
 
   @VisibleForTesting
   public static ImmutableList<String> getSchemas() {
-    ImmutableSet<String> schemasToSkip =
-        RegistryEnvironment.get().equals(RegistryEnvironment.PRODUCTION)
-            ? NON_PROD_SCHEMAS
-            : ONLY_PROD_SCHEMAS;
-    return ALL_SCHEMAS.stream().filter(s -> !schemasToSkip.contains(s)).collect(toImmutableList());
-  }
-
-  @VisibleForTesting
-  public static void reloadTransformers() {
-    INPUT_TRANSFORMER = new XmlTransformer(getSchemas(), EppInput.class);
-    OUTPUT_TRANSFORMER = new XmlTransformer(getSchemas(), EppOutput.class);
+    if (RegistryEnvironment.get().equals(RegistryEnvironment.PRODUCTION)) {
+      return ALL_SCHEMAS.stream()
+          .filter(s -> !NON_PROD_SCHEMAS.contains(s))
+          .collect(toImmutableList());
+    }
+    return ALL_SCHEMAS;
   }
 
   public static void validateOutput(String xml) throws XmlException {

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

@@ -46,12 +46,14 @@ 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");
+      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");
 
   /** Enum representing which environments should have which service extensions enabled. */
   private enum ServiceExtensionVisibility {
     ALL,
-    ONLY_IN_PRODUCTION,
     ONLY_IN_NON_PRODUCTION,
     NONE
   }
@@ -64,15 +66,15 @@ public class ProtocolDefinition {
     FEE_0_6(
         FeeCheckCommandExtensionV06.class,
         FeeCheckResponseExtensionV06.class,
-        ServiceExtensionVisibility.ONLY_IN_PRODUCTION),
+        ServiceExtensionVisibility.ALL),
     FEE_0_11(
         FeeCheckCommandExtensionV11.class,
         FeeCheckResponseExtensionV11.class,
-        ServiceExtensionVisibility.ONLY_IN_PRODUCTION),
+        ServiceExtensionVisibility.ALL),
     FEE_0_12(
         FeeCheckCommandExtensionV12.class,
         FeeCheckResponseExtensionV12.class,
-        ServiceExtensionVisibility.ONLY_IN_PRODUCTION),
+        ServiceExtensionVisibility.ALL),
     FEE_1_00(
         FeeCheckCommandExtensionStdV1.class,
         FeeCheckResponseExtensionStdV1.class,
@@ -114,7 +116,6 @@ public class ProtocolDefinition {
     public boolean isVisible() {
       return switch (visibility) {
         case ALL -> true;
-        case ONLY_IN_PRODUCTION -> RegistryEnvironment.get().equals(RegistryEnvironment.PRODUCTION);
         case ONLY_IN_NON_PRODUCTION ->
             !RegistryEnvironment.get().equals(RegistryEnvironment.PRODUCTION);
         case NONE -> false;

core/src/main/java/google/registry/monitoring/whitebox/JvmMetrics.java

@@ -0,0 +1,103 @@
+// Copyright 2017 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.monitoring.whitebox;
+
+import com.google.common.base.Supplier;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.monitoring.metrics.LabelDescriptor;
+import com.google.monitoring.metrics.MetricRegistry;
+import com.google.monitoring.metrics.MetricRegistryImpl;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryUsage;
+
+/** Exposes JVM metrics. */
+@Singleton
+class JvmMetrics {
+
+  private static final ImmutableSet<LabelDescriptor> TYPE_LABEL_SET =
+      ImmutableSet.of(LabelDescriptor.create("type", "Memory type (e.g., heap, non_heap)"));
+  private final MemoryMXBean memoryMxBean;
+
+  @Inject
+  JvmMetrics() {
+    this(ManagementFactory.getMemoryMXBean());
+  }
+
+  /** Constructor for testing. */
+  JvmMetrics(MemoryMXBean memoryMxBean) {
+    this.memoryMxBean = memoryMxBean;
+  }
+
+  /** Registers JVM gauges with the default registry. */
+  void register() {
+    MetricRegistry registry = MetricRegistryImpl.getDefault();
+
+    registry.newGauge(
+        "/jvm/memory/used",
+        "Current memory usage in bytes",
+        "bytes",
+        TYPE_LABEL_SET,
+        (Supplier<ImmutableMap<ImmutableList<String>, Long>>) this::getUsedMemory,
+        Long.class);
+
+    registry.newGauge(
+        "/jvm/memory/committed",
+        "Committed memory in bytes",
+        "bytes",
+        TYPE_LABEL_SET,
+        (Supplier<ImmutableMap<ImmutableList<String>, Long>>) this::getCommittedMemory,
+        Long.class);
+
+    registry.newGauge(
+        "/jvm/memory/max",
+        "Maximum memory in bytes",
+        "bytes",
+        TYPE_LABEL_SET,
+        (Supplier<ImmutableMap<ImmutableList<String>, Long>>) this::getMaxMemory,
+        Long.class);
+  }
+
+  ImmutableMap<ImmutableList<String>, Long> getUsedMemory() {
+    MemoryUsage heapUsage = memoryMxBean.getHeapMemoryUsage();
+    MemoryUsage nonHeapUsage = memoryMxBean.getNonHeapMemoryUsage();
+
+    return ImmutableMap.of(
+        ImmutableList.of("heap"), heapUsage.getUsed(),
+        ImmutableList.of("non_heap"), nonHeapUsage.getUsed());
+  }
+
+  ImmutableMap<ImmutableList<String>, Long> getCommittedMemory() {
+    MemoryUsage heapUsage = memoryMxBean.getHeapMemoryUsage();
+    MemoryUsage nonHeapUsage = memoryMxBean.getNonHeapMemoryUsage();
+
+    return ImmutableMap.of(
+        ImmutableList.of("heap"), heapUsage.getCommitted(),
+        ImmutableList.of("non_heap"), nonHeapUsage.getCommitted());
+  }
+
+  ImmutableMap<ImmutableList<String>, Long> getMaxMemory() {
+    MemoryUsage heapUsage = memoryMxBean.getHeapMemoryUsage();
+    MemoryUsage nonHeapUsage = memoryMxBean.getNonHeapMemoryUsage();
+
+    return ImmutableMap.of(
+        ImmutableList.of("heap"), heapUsage.getMax(),
+        ImmutableList.of("non_heap"), nonHeapUsage.getMax());
+  }
+}

core/src/main/java/google/registry/monitoring/whitebox/StackdriverModule.java

@@ -32,7 +32,7 @@ import jakarta.inject.Named;
 import jakarta.inject.Singleton;
 import org.joda.time.Duration;
 
-/** Dagger module for Google Stackdriver service connection objects. */
+/** Dagger module for monitoring and Google Stackdriver service connection objects. */
 @Module
 public final class StackdriverModule {
 
@@ -77,7 +77,11 @@ public final class StackdriverModule {
 
   @Provides
   static MetricReporter provideMetricReporter(
-      MetricWriter metricWriter, @Config("metricsWriteInterval") Duration writeInterval) {
+      MetricWriter metricWriter,
+      @Config("metricsWriteInterval") Duration writeInterval,
+      JvmMetrics jvmMetrics) {
+    jvmMetrics.register();
+
     return new MetricReporter(
         metricWriter,
         writeInterval.getStandardSeconds(),

core/src/main/java/google/registry/rde/RdeMarshaller.java

@@ -19,7 +19,6 @@ import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.common.flogger.FluentLogger;
 import google.registry.model.ImmutableObject;
-import google.registry.model.contact.Contact;
 import google.registry.model.domain.Domain;
 import google.registry.model.host.Host;
 import google.registry.model.rde.RdeMode;
@@ -118,12 +117,6 @@ public final class RdeMarshaller implements Serializable {
     }
   }
 
-  /** Turns {@link Contact} object into an XML fragment. */
-  public DepositFragment marshalContact(Contact contact) {
-    return marshalResource(
-        RdeResourceType.CONTACT, contact, ContactToXjcConverter.convert(contact));
-  }
-
   /** Turns {@link Domain} object into an XML fragment. */
   public DepositFragment marshalDomain(Domain domain, RdeMode mode) {
     return marshalResource(

core/src/main/java/google/registry/rde/RdeResourceType.java

@@ -25,7 +25,6 @@ import java.util.EnumSet;
 
 /** Types of objects that get embedded in an escrow deposit. */
 public enum RdeResourceType {
-  CONTACT("urn:ietf:params:xml:ns:rdeContact-1.0", EnumSet.of(FULL)),
   DOMAIN("urn:ietf:params:xml:ns:rdeDomain-1.0", EnumSet.of(FULL, THIN)),
   HOST("urn:ietf:params:xml:ns:rdeHost-1.0", EnumSet.of(FULL)),
   REGISTRAR("urn:ietf:params:xml:ns:rdeRegistrar-1.0", EnumSet.of(FULL, THIN)),

core/src/test/java/google/registry/beam/rde/RdePipelineTest.java

@@ -25,13 +25,11 @@ import static google.registry.model.rde.RdeMode.THIN;
 import static google.registry.persistence.transaction.JpaTransactionManagerExtension.makeRegistrar1;
 import static google.registry.persistence.transaction.JpaTransactionManagerExtension.makeRegistrar2;
 import static google.registry.persistence.transaction.TransactionManagerFactory.tm;
-import static google.registry.rde.RdeResourceType.CONTACT;
 import static google.registry.rde.RdeResourceType.DOMAIN;
 import static google.registry.rde.RdeResourceType.HOST;
 import static google.registry.rde.RdeResourceType.REGISTRAR;
 import static google.registry.testing.DatabaseHelper.createTld;
 import static google.registry.testing.DatabaseHelper.newDomain;
-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.persistEppResource;
@@ -54,10 +52,6 @@ import google.registry.gcs.GcsUtils;
 import google.registry.keyring.api.PgpHelper;
 import google.registry.model.common.Cursor;
 import google.registry.model.common.Cursor.CursorType;
-import google.registry.model.contact.Contact;
-import google.registry.model.contact.ContactBase;
-import google.registry.model.contact.ContactHistory;
-import google.registry.model.domain.DesignatedContact;
 import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainBase;
 import google.registry.model.domain.DomainHistory;
@@ -114,8 +108,6 @@ public class RdePipelineTest {
 
   private static final String DOMAIN_NAME_PATTERN = "<rdeDomain:name>(.*)</rdeDomain:name>";
 
-  private static final String CONTACT_ID_PATTERN = "<rdeContact:id>(.*)</rdeContact:id>";
-
   private static final String HOST_NAME_PATTERN = "<rdeHost:name>(.*)</rdeHost:name>";
 
   // This is the default creation time for test data.
@@ -139,7 +131,6 @@ public class RdePipelineTest {
       ImmutableList.of(
           DepositFragment.create(DOMAIN, "<rdeDomain:domain/>\n", ""),
           DepositFragment.create(REGISTRAR, "<rdeRegistrar:registrar/>\n", ""),
-          DepositFragment.create(CONTACT, "<rdeContact:contact/>\n", ""),
           DepositFragment.create(HOST, "<rdeHost:host/>\n", ""));
 
   private final GcsUtils gcsUtils = new GcsUtils(LocalStorageHelper.getOptions());
@@ -165,21 +156,6 @@ public class RdePipelineTest {
 
   private RdePipeline rdePipeline;
 
-  private ContactHistory persistContactHistory(ContactBase contact) {
-    return persistResource(
-        new ContactHistory.Builder()
-            .setType(HistoryEntry.Type.HOST_CREATE)
-            .setXmlBytes("<xml></xml>".getBytes(UTF_8))
-            .setModificationTime(clock.nowUtc())
-            .setRegistrarId("TheRegistrar")
-            .setTrid(Trid.create("ABC-123", "server-trid"))
-            .setBySuperuser(false)
-            .setReason("reason")
-            .setRequestedByRegistrar(true)
-            .setContact(contact)
-            .build());
-  }
-
   private DomainHistory persistDomainHistory(DomainBase domain) {
     DomainTransactionRecord transactionRecord =
         new DomainTransactionRecord.Builder()
@@ -254,20 +230,18 @@ public class RdePipelineTest {
               RdeRevision.saveRevision("soy", now, FULL, 0);
             });
 
-    // This contact is never referenced.
-    persistContactHistory(persistActiveContact("contactX"));
-    Contact contact1 = persistActiveContact("contact1234");
-    persistContactHistory(contact1);
-    Contact contact2 = persistActiveContact("contact456");
-    persistContactHistory(contact2);
-
     // This host is never referenced.
     persistHostHistory(persistActiveHost("ns0.domain.tld"));
     Host host1 = persistActiveHost("ns1.external.tld");
     persistHostHistory(host1);
     Domain helloDomain =
         persistEppResource(
-            newDomain("hello.soy", contact1).asBuilder().addNameserver(host1.createVKey()).build());
+            newDomain("hello.soy")
+                .asBuilder()
+                .addNameserver(host1.createVKey())
+                .setRegistrant(Optional.empty())
+                .setContacts(ImmutableSet.of())
+                .build());
     persistDomainHistory(helloDomain);
     persistHostHistory(persistActiveHost("not-used-subordinate.hello.soy"));
     Host host2 = persistActiveHost("ns1.hello.soy");
@@ -276,14 +250,15 @@ public class RdePipelineTest {
     // This domain has no registrant.
     Domain kittyDomain =
         persistEppResource(
-            newDomain("kitty.fun", contact2)
+            newDomain("kitty.fun")
                 .asBuilder()
                 .addNameservers(ImmutableSet.of(host1.createVKey(), host2.createVKey()))
                 .setRegistrant(Optional.empty())
+                .setContacts(ImmutableSet.of())
                 .build());
     persistDomainHistory(kittyDomain);
     // Should not appear because the TLD is not included in a pending deposit.
-    persistDomainHistory(persistEppResource(newDomain("lol.cat", contact1)));
+    persistDomainHistory(persistEppResource(newDomain("lol.cat")));
     // To be deleted.
     Domain deletedDomain = persistActiveDomain("deleted.soy");
     persistDomainHistory(deletedDomain);
@@ -293,8 +268,7 @@ public class RdePipelineTest {
     persistDomainHistory(deletedDomain.asBuilder().setDeletionTime(clock.nowUtc()).build());
     kittyDomain = kittyDomain.asBuilder().setDomainName("cat.fun").build();
     persistDomainHistory(kittyDomain);
-    Contact contact3 = persistActiveContact("contact789");
-    persistContactHistory(contact3);
+
     // This is a subordinate domain in TLD .cat, which is not included in any pending deposit. But
     // it should still be included as a subordinate host in the pendign deposit for .soy.
     Host host3 = persistActiveHost("ns1.lol.cat");
@@ -302,17 +276,8 @@ public class RdePipelineTest {
     persistDomainHistory(
         helloDomain
             .asBuilder()
-            .removeContacts(
-                helloDomain.getContacts().stream()
-                    .filter(dc -> dc.getType() == DesignatedContact.Type.ADMIN)
-                    .collect(toImmutableSet()))
-            .addContacts(
-                ImmutableSet.of(
-                    DesignatedContact.create(DesignatedContact.Type.ADMIN, contact3.createVKey())))
             .addNameserver(host3.createVKey())
             .build());
-    // contact456 is renamed to contactABC.
-    persistContactHistory(contact2.asBuilder().setContactId("contactABC").build());
     // ns1.hello.soy is renamed to ns2.hello.soy
     persistHostHistory(host2.asBuilder().setHostName("ns2.hello.soy").build());
 
@@ -320,18 +285,11 @@ public class RdePipelineTest {
     // resulting deposit fragments.
     clock.advanceBy(Duration.standardDays(2));
     persistDomainHistory(kittyDomain.asBuilder().setDeletionTime(clock.nowUtc()).build());
-    Contact futureContact = persistActiveContact("future-contact");
-    persistContactHistory(futureContact);
     Host futureHost = persistActiveHost("ns1.future.tld");
     persistHostHistory(futureHost);
     persistDomainHistory(
         persistEppResource(
-            newDomain("future.soy", futureContact)
-                .asBuilder()
-                .setNameservers(futureHost.createVKey())
-                .build()));
-    // contactABC is renamed to contactXYZ.
-    persistContactHistory(contact2.asBuilder().setContactId("contactXYZ").build());
+            newDomain("future.soy").asBuilder().setNameservers(futureHost.createVKey()).build()));
     // ns2.hello.soy is renamed to ns3.hello.soy
     persistHostHistory(host2.asBuilder().setHostName("ns3.hello.soy").build());
 
@@ -390,11 +348,9 @@ public class RdePipelineTest {
                               """
                               <rdeDomain:domain>
                                   <rdeDomain:name>cat.fun</rdeDomain:name>
-                                  <rdeDomain:roid>15-FUN</rdeDomain:roid>
+                                  <rdeDomain:roid>10-FUN</rdeDomain:roid>
                                   <rdeDomain:uName>cat.fun</rdeDomain:uName>
                                   <rdeDomain:status s="ok"/>
-                                  <rdeDomain:contact type="admin">contact456</rdeDomain:contact>
-                                  <rdeDomain:contact type="tech">contact456</rdeDomain:contact>
                                   <rdeDomain:ns>
                                       <domain:hostObj>ns1.external.tld</domain:hostObj>
                                       <domain:hostObj>ns1.hello.soy</domain:hostObj>
@@ -407,14 +363,7 @@ public class RdePipelineTest {
                               """);
                     }
                     if (kv.getKey().mode().equals(FULL)) {
-                      // Contact fragments for hello.soy.
                       if ("soy".equals(kv.getKey().tld())) {
-                        assertThat(
-                                getFragmentForType(kv, CONTACT)
-                                    .map(getXmlElement(CONTACT_ID_PATTERN))
-                                    .collect(toImmutableSet()))
-                            .containsExactly("contact1234", "contact789");
-
                         // Host fragments for hello.soy.
                         assertThat(
                                 getFragmentForType(kv, HOST)
@@ -428,12 +377,9 @@ public class RdePipelineTest {
                                 """
                                 <rdeDomain:domain>
                                     <rdeDomain:name>hello.soy</rdeDomain:name>
-                                    <rdeDomain:roid>E-SOY</rdeDomain:roid>
+                                    <rdeDomain:roid>8-SOY</rdeDomain:roid>
                                     <rdeDomain:uName>hello.soy</rdeDomain:uName>
                                     <rdeDomain:status s="ok"/>
-                                    <rdeDomain:registrant>contact1234</rdeDomain:registrant>
-                                    <rdeDomain:contact type="admin">contact789</rdeDomain:contact>
-                                    <rdeDomain:contact type="tech">contact1234</rdeDomain:contact>
                                     <rdeDomain:ns>
                                         <domain:hostObj>ns1.external.tld</domain:hostObj>
                                         <domain:hostObj>ns1.lol.cat</domain:hostObj>
@@ -445,13 +391,6 @@ public class RdePipelineTest {
                                 </rdeDomain:domain>\
                                 """);
                       } else {
-                        // Contact fragments for cat.fun.
-                        assertThat(
-                                getFragmentForType(kv, CONTACT)
-                                    .map(getXmlElement(CONTACT_ID_PATTERN))
-                                    .collect(toImmutableSet()))
-                            .containsExactly("contactABC");
-
                         // Host fragments for cat.soy.
                         assertThat(
                                 getFragmentForType(kv, HOST)
@@ -460,22 +399,19 @@ public class RdePipelineTest {
                             .containsExactly("ns1.external.tld", "ns2.hello.soy");
                       }
                     } else {
-                      // BRDA does not contain contact or hosts.
+                      // BRDA does not contain hosts.
                       assertThat(
                               Streams.stream(kv.getValue())
-                                  .anyMatch(
-                                      fragment ->
-                                          fragment.type().equals(CONTACT)
-                                              || fragment.type().equals(HOST)))
+                                  .anyMatch(fragment -> fragment.type().equals(HOST)))
                           .isFalse();
 
-                      // Domain fragments for hello.soy: Note that this contains no contact info.
+                      // Domain fragments for hello.soy.
                       assertThat(domainFrags.stream().findFirst().get().xml().strip())
                           .isEqualTo(
                               """
                               <rdeDomain:domain>
                                   <rdeDomain:name>hello.soy</rdeDomain:name>
-                                  <rdeDomain:roid>E-SOY</rdeDomain:roid>
+                                  <rdeDomain:roid>8-SOY</rdeDomain:roid>
                                   <rdeDomain:uName>hello.soy</rdeDomain:uName>
                                   <rdeDomain:status s="ok"/>
                                   <rdeDomain:ns>

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

@@ -209,6 +209,14 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
   private static final String ENCODED_SMD =
       TmchData.readEncodedSignedMark(TmchTestData.loadFile(SMD_FILE_PATH)).getEncodedData();
 
+  private static final ImmutableMap<String, String> FEE_06_MAP =
+      ImmutableMap.of("FEE_VERSION", "fee-0.6", "FEE_NS", "fee", "CURRENCY", "USD", "FEE", "15.00");
+  private static final ImmutableMap<String, String> FEE_11_MAP =
+      ImmutableMap.of(
+          "FEE_VERSION", "fee-0.11", "FEE_NS", "fee", "CURRENCY", "USD", "FEE", "15.00");
+  private static final ImmutableMap<String, String> FEE_12_MAP =
+      ImmutableMap.of(
+          "FEE_VERSION", "fee-0.12", "FEE_NS", "fee", "CURRENCY", "USD", "FEE", "15.00");
   private static final ImmutableMap<String, String> FEE_STD_1_0_MAP =
       ImmutableMap.of(
           "FEE_VERSION", "epp:fee-1.0", "FEE_NS", "fee1_00", "CURRENCY", "USD", "FEE", "15.00");
@@ -3305,6 +3313,791 @@ class DomainCreateFlowTest extends ResourceFlowTestCase<DomainCreateFlow, Domain
         .isEqualTo(Money.of(USD, 24));
   }
 
+  @Test
+  void testFailure_wrongFeeAmount_v06() {
+    setEppInput("domain_create_fee.xml", FEE_06_MAP);
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setCreateBillingCostTransitions(
+                ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
+            .build());
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongFeeAmount_v11() {
+    setEppInput("domain_create_fee.xml", FEE_11_MAP);
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setCreateBillingCostTransitions(
+                ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
+            .build());
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongFeeAmount_v12() {
+    setEppInput("domain_create_fee.xml", FEE_12_MAP);
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setCreateBillingCostTransitions(
+                ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
+            .build());
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_wrongFeeAmountTooHigh_defaultToken_v06() throws Exception {
+    setupDefaultTokenWithDiscount();
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setCreateBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 8)))
+            .build());
+    // Expects fee of $24
+    setEppInput("domain_create_fee.xml", FEE_06_MAP);
+    persistContactsAndHosts();
+    // $15 is 50% off the first year registration ($8) and 0% 0ff the 2nd year (renewal at $11)
+    runFlowAssertResponse(loadFile("domain_create_response_fee.xml", FEE_06_MAP));
+  }
+
+  @Test
+  void testSuccess_wrongFeeAmountTooHigh_defaultToken_v11() throws Exception {
+    setupDefaultTokenWithDiscount();
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setCreateBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 8)))
+            .build());
+    // Expects fee of $24
+    setEppInput("domain_create_fee.xml", FEE_11_MAP);
+    persistContactsAndHosts();
+    // $12 is equal to 50% off the first year registration and 0% 0ff the 2nd year
+    runFlowAssertResponse(loadFile("domain_create_response_fee.xml", FEE_11_MAP));
+  }
+
+  @Test
+  void testSuccess_wrongFeeAmountTooHigh_defaultToken_v12() throws Exception {
+    setupDefaultTokenWithDiscount();
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setCreateBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 8)))
+            .build());
+    // Expects fee of $24
+    setEppInput("domain_create_fee.xml", FEE_12_MAP);
+    persistContactsAndHosts();
+    // $12 is equal to 50% off the first year registration and 0% 0ff the 2nd year
+    runFlowAssertResponse(loadFile("domain_create_response_fee.xml", FEE_12_MAP));
+  }
+
+  @Test
+  void testFailure_omitFeeExtensionOnLogin_v06() {
+    for (String uri : FEE_EXTENSION_URIS) {
+      removeServiceExtensionUri(uri);
+    }
+    createTld("net");
+    setEppInput("domain_create_fee.xml", FEE_06_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UndeclaredServiceExtensionException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_omitFeeExtensionOnLogin_v11() {
+    for (String uri : FEE_EXTENSION_URIS) {
+      removeServiceExtensionUri(uri);
+    }
+    createTld("net");
+    setEppInput("domain_create_fee.xml", FEE_11_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UndeclaredServiceExtensionException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_omitFeeExtensionOnLogin_v12() {
+    for (String uri : FEE_EXTENSION_URIS) {
+      removeServiceExtensionUri(uri);
+    }
+    createTld("net");
+    setEppInput("domain_create_fee.xml", FEE_12_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UndeclaredServiceExtensionException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_eapFeeApplied_v06() throws Exception {
+    setEppInput(
+        "domain_create_eap_fee.xml",
+        new ImmutableMap.Builder<String, String>()
+            .putAll(FEE_06_MAP)
+            .put("DESCRIPTION_1", "create")
+            .put("DESCRIPTION_2", "Early Access Period")
+            .build());
+    persistContactsAndHosts();
+    setEapForTld("tld");
+    doSuccessfulTest("tld", "domain_create_response_eap_fee.xml", FEE_06_MAP);
+  }
+
+  @Test
+  void testSuccess_eapFeeApplied_v11() throws Exception {
+    setEppInput(
+        "domain_create_eap_fee.xml",
+        new ImmutableMap.Builder<String, String>()
+            .putAll(FEE_11_MAP)
+            .put("DESCRIPTION_1", "create")
+            .put("DESCRIPTION_2", "Early Access Period")
+            .build());
+    persistContactsAndHosts();
+    setEapForTld("tld");
+    doSuccessfulTest("tld", "domain_create_response_eap_fee.xml", FEE_11_MAP);
+  }
+
+  @Test
+  void testSuccess_eapFeeApplied_v12() throws Exception {
+    setEppInput(
+        "domain_create_eap_fee.xml",
+        new ImmutableMap.Builder<String, String>()
+            .putAll(FEE_12_MAP)
+            .put("DESCRIPTION_1", "create")
+            .put("DESCRIPTION_2", "Early Access Period")
+            .build());
+    persistContactsAndHosts();
+    setEapForTld("tld");
+    doSuccessfulTest("tld", "domain_create_response_eap_fee.xml", FEE_12_MAP);
+  }
+
+  @Test
+  void testFailure_feeGivenInWrongScale_v06() {
+    setEppInput("domain_create_fee_bad_scale.xml", FEE_06_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_feeGivenInWrongScale_v11() {
+    setEppInput("domain_create_fee_bad_scale.xml", FEE_11_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_feeGivenInWrongScale_v12() {
+    setEppInput("domain_create_fee_bad_scale.xml", FEE_12_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_appliedFee_v06() {
+    setEppInput("domain_create_fee_applied.xml", FEE_06_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_appliedFee_v11() {
+    setEppInput("domain_create_fee_applied.xml", FEE_11_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_appliedFee_v12() {
+    setEppInput("domain_create_fee_applied.xml", FEE_12_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongFeeAmountTooLow_defaultToken_v06() throws Exception {
+    setupDefaultTokenWithDiscount();
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setCreateBillingCostTransitions(
+                ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 100)))
+            .build());
+    // Expects fee of $24
+    setEppInput("domain_create_fee.xml", FEE_06_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongFeeAmountTooLow_defaultToken_v11() throws Exception {
+    setupDefaultTokenWithDiscount();
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setCreateBillingCostTransitions(
+                ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 100)))
+            .build());
+    // Expects fee of $24
+    setEppInput("domain_create_fee.xml", FEE_11_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongFeeAmountTooLow_defaultToken_v12() throws Exception {
+    setupDefaultTokenWithDiscount();
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setCreateBillingCostTransitions(
+                ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 100)))
+            .build());
+    // Expects fee of $24
+    setEppInput("domain_create_fee.xml", FEE_12_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongCurrency_v06() {
+    setEppInput(
+        "domain_create_fee.xml", ImmutableMap.of("FEE_VERSION", "fee-0.6", "CURRENCY", "EUR"));
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongCurrency_v11() {
+    setEppInput(
+        "domain_create_fee.xml", ImmutableMap.of("FEE_VERSION", "fee-0.11", "CURRENCY", "EUR"));
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongCurrency_v12() {
+    setEppInput(
+        "domain_create_fee.xml", ImmutableMap.of("FEE_VERSION", "fee-0.12", "CURRENCY", "EUR"));
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_gracePeriodFee_v06() {
+    setEppInput("domain_create_fee_grace_period.xml", FEE_06_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_gracePeriodFee_v11() {
+    setEppInput("domain_create_fee_grace_period.xml", FEE_11_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_gracePeriodFee_v12() {
+    setEppInput("domain_create_fee_grace_period.xml", FEE_12_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_fee_withDefaultAttributes_v06() throws Exception {
+    setEppInput("domain_create_fee_defaults.xml", FEE_06_MAP);
+    persistContactsAndHosts();
+    doSuccessfulTest(
+        "tld",
+        "domain_create_response_fee.xml",
+        ImmutableMap.of("FEE_VERSION", "fee-0.6", "FEE", "24.00"));
+  }
+
+  @Test
+  void testSuccess_fee_withDefaultAttributes_v11() throws Exception {
+    setEppInput("domain_create_fee_defaults.xml", FEE_11_MAP);
+    persistContactsAndHosts();
+    doSuccessfulTest(
+        "tld",
+        "domain_create_response_fee.xml",
+        ImmutableMap.of("FEE_VERSION", "fee-0.11", "FEE", "24.00"));
+  }
+
+  @Test
+  void testSuccess_fee_withDefaultAttributes_v12() throws Exception {
+    setEppInput("domain_create_fee_defaults.xml", FEE_12_MAP);
+    persistContactsAndHosts();
+    doSuccessfulTest(
+        "tld",
+        "domain_create_response_fee.xml",
+        ImmutableMap.of("FEE_VERSION", "fee-0.12", "FEE", "24.00"));
+  }
+
+  @Test
+  void testFailure_refundableFee_v06() {
+    setEppInput("domain_create_fee_refundable.xml", FEE_06_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_refundableFee_v11() {
+    setEppInput("domain_create_fee_refundable.xml", FEE_11_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_refundableFee_v12() {
+    setEppInput("domain_create_fee_refundable.xml", FEE_12_MAP);
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_fee_v06() throws Exception {
+    setEppInput("domain_create_fee.xml", FEE_06_MAP);
+    persistContactsAndHosts();
+    doSuccessfulTest(
+        "tld",
+        "domain_create_response_fee.xml",
+        ImmutableMap.of("FEE_VERSION", "fee-0.6", "FEE", "24.00"));
+  }
+
+  @Test
+  void testSuccess_fee_v11() throws Exception {
+    setEppInput("domain_create_fee.xml", FEE_11_MAP);
+    persistContactsAndHosts();
+    doSuccessfulTest(
+        "tld",
+        "domain_create_response_fee.xml",
+        ImmutableMap.of("FEE_VERSION", "fee-0.11", "FEE", "24.00"));
+  }
+
+  @Test
+  void testSuccess_fee_v12() throws Exception {
+    setEppInput("domain_create_fee.xml", FEE_12_MAP);
+    persistContactsAndHosts();
+    doSuccessfulTest(
+        "tld",
+        "domain_create_response_fee.xml",
+        ImmutableMap.of("FEE_VERSION", "fee-0.12", "FEE", "24.00"));
+  }
+
+  @Test
+  void testFailure_eapFee_description_multipleMatch_v06() {
+    setEppInput(
+        "domain_create_eap_fee.xml",
+        ImmutableMap.of(
+            "FEE_VERSION",
+            "fee-0.6",
+            "DESCRIPTION_1",
+            "create",
+            "DESCRIPTION_2",
+            "renew transfer"));
+    persistContactsAndHosts();
+    setEapForTld("tld");
+    EppException thrown = assertThrows(FeeDescriptionMultipleMatchesException.class, this::runFlow);
+    assertThat(thrown).hasMessageThat().contains("RENEW, TRANSFER");
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_unknownCurrency_v12() {
+    setEppInput(
+        "domain_create_fee.xml", ImmutableMap.of("FEE_VERSION", "fee-0.12", "CURRENCY", "BAD"));
+    persistContactsAndHosts();
+    EppException thrown = assertThrows(UnknownCurrencyEppException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testTieredPricingPromoResponse_v12() throws Exception {
+    sessionMetadata.setRegistrarId("NewRegistrar");
+    setupDefaultTokenWithDiscount("NewRegistrar");
+    setEppInput("domain_create_fee.xml", FEE_12_MAP);
+    persistContactsAndHosts();
+
+    // Fee in the result should be 24 (create cost of 13 plus renew cost of 11) even though the
+    // actual cost is lower (due to the tiered pricing promo)
+    runFlowAssertResponse(
+        loadFile(
+            "domain_create_response_fee.xml",
+            ImmutableMap.of("FEE_VERSION", "fee-0.12", "FEE", "24.00")));
+    // Expected cost is half off the create cost (13/2 == 6.50) plus one full-cost renew (11)
+    assertThat(Iterables.getOnlyElement(loadAllOf(BillingEvent.class)).getCost())
+        .isEqualTo(Money.of(USD, 17.50));
+  }
+
+  @Test
+  void testSuccess_eapFee_multipleEAPfees_doNotAddToExpectedValue_v06() {
+    setEppInput(
+        "domain_create_extra_fees.xml",
+        new ImmutableMap.Builder<String, String>()
+            .put("FEE_VERSION", "fee-0.6")
+            .put("DESCRIPTION_1", "create")
+            .put("FEE_1", "24")
+            .put("DESCRIPTION_2", "Early Access Period")
+            .put("FEE_2", "55")
+            .put("DESCRIPTION_3", "Early Access Period")
+            .put("FEE_3", "55")
+            .build());
+    persistContactsAndHosts();
+    setEapForTld("tld");
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertThat(thrown).hasMessageThat().contains("expected fee of USD 100.00");
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_eapFee_description_swapped_v06() {
+    setEppInput(
+        "domain_create_eap_fee.xml",
+        ImmutableMap.of(
+            "FEE_VERSION",
+            "fee-0.6",
+            "DESCRIPTION_1",
+            "Early Access Period",
+            "DESCRIPTION_2",
+            "create"));
+    persistContactsAndHosts();
+    setEapForTld("tld");
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertThat(thrown).hasMessageThat().contains("CREATE");
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_doesNotApplyNonPremiumDefaultTokenToPremiumName_v12() throws Exception {
+    persistContactsAndHosts();
+    createTld("example");
+    persistResource(
+        setupDefaultTokenWithDiscount()
+            .asBuilder()
+            .setAllowedTlds(ImmutableSet.of("example"))
+            .build());
+    setEppInput("domain_create_premium.xml", FEE_12_MAP);
+    runFlowAssertResponse(
+        loadFile(
+            "domain_create_response_premium.xml",
+            ImmutableMap.of(
+                "FEE_VERSION", "fee-0.12", "EXDATE", "2001-04-03T22:00:00.0Z", "FEE", "200.00")));
+    assertSuccessfulCreate("example", ImmutableSet.of(), 200);
+  }
+
+  @Test
+  void testSuccess_superuserOverridesPremiumNameBlock_v12() throws Exception {
+    createTld("example");
+    setEppInput("domain_create_premium.xml", FEE_12_MAP);
+    persistContactsAndHosts("net");
+    // Modify the Registrar to block premium names.
+    persistResource(loadRegistrar("TheRegistrar").asBuilder().setBlockPremiumNames(true).build());
+    runFlowAssertResponse(
+        CommitMode.LIVE,
+        SUPERUSER,
+        loadFile(
+            "domain_create_response_premium.xml",
+            ImmutableMap.of(
+                "FEE_VERSION", "fee-0.12", "EXDATE", "2001-04-03T22:00:00.0Z", "FEE", "200.00")));
+    assertSuccessfulCreate("example", ImmutableSet.of(), 200);
+  }
+
+  @Test
+  void testFailure_eapFee_combined_v06() {
+    setEppInput("domain_create_eap_combined_fee.xml", FEE_06_MAP);
+    persistContactsAndHosts();
+    setEapForTld("tld");
+    EppException thrown = assertThrows(FeeDescriptionParseException.class, this::runFlow);
+    assertThat(thrown).hasMessageThat().contains("No fee description");
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_nonpremiumCreateToken_v06() throws Exception {
+    createTld("example");
+    persistContactsAndHosts();
+    persistResource(
+        new AllocationToken.Builder()
+            .setToken("abc123")
+            .setTokenType(SINGLE_USE)
+            .setRegistrationBehavior(RegistrationBehavior.NONPREMIUM_CREATE)
+            .setDomainName("rich.example")
+            .build());
+    setEppInput(
+        "domain_create_premium_allocationtoken.xml",
+        ImmutableMap.of("FEE_VERSION", "fee-0.6", "YEARS", "1", "FEE", "13.00"));
+    runFlowAssertResponse(loadFile("domain_create_nonpremium_token_response.xml", FEE_06_MAP));
+  }
+
+  @Test
+  void testSuccess_eapFee_fullDescription_includingArbitraryExpiryTime_v06() throws Exception {
+    setEppInput(
+        "domain_create_eap_fee.xml",
+        ImmutableMap.of(
+            "FEE_VERSION",
+            "fee-0.6",
+            "DESCRIPTION_1",
+            "create",
+            "DESCRIPTION_2",
+            "Early Access Period, fee expires: 2022-03-01T00:00:00.000Z"));
+    persistContactsAndHosts();
+    setEapForTld("tld");
+    doSuccessfulTest("tld", "domain_create_response_eap_fee.xml", FEE_06_MAP);
+  }
+
+  @Test
+  void testSuccess_allocationToken_multiYearDiscount_worksForPremiums_v06() throws Exception {
+    createTld("example");
+    persistContactsAndHosts();
+    persistResource(
+        new AllocationToken.Builder()
+            .setToken("abc123")
+            .setTokenType(SINGLE_USE)
+            .setDomainName("rich.example")
+            .setDiscountFraction(0.98)
+            .setDiscountYears(2)
+            .setDiscountPremiums(true)
+            .setTokenStatusTransitions(
+                ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
+                    .put(START_OF_TIME, TokenStatus.NOT_STARTED)
+                    .put(clock.nowUtc().plusMillis(1), TokenStatus.VALID)
+                    .put(clock.nowUtc().plusSeconds(1), TokenStatus.ENDED)
+                    .build())
+            .build());
+    clock.advanceOneMilli();
+    setEppInput(
+        "domain_create_premium_allocationtoken.xml",
+        ImmutableMap.of("FEE_VERSION", "fee-0.6", "YEARS", "3", "FEE", "104.00"));
+    runFlowAssertResponse(
+        loadFile(
+            "domain_create_response_premium.xml",
+            ImmutableMap.of(
+                "FEE_VERSION", "fee-0.6", "EXDATE", "2002-04-03T22:00:00.0Z", "FEE", "104.00")));
+    BillingEvent billingEvent =
+        Iterables.getOnlyElement(DatabaseHelper.loadAllOf(BillingEvent.class));
+    assertThat(billingEvent.getTargetId()).isEqualTo("rich.example");
+    // 1yr @ $100 + 2yrs @ $100 * (1 - 0.98) = $104
+    assertThat(billingEvent.getCost()).isEqualTo(Money.of(USD, 104.00));
+  }
+
+  @Test
+  void testSuccess_eapFee_multipleEAPfees_addToExpectedValue_v06() throws Exception {
+    setEppInput(
+        "domain_create_extra_fees.xml",
+        new ImmutableMap.Builder<String, String>()
+            .put("FEE_VERSION", "fee-0.6")
+            .put("DESCRIPTION_1", "create")
+            .put("FEE_1", "24")
+            .put("DESCRIPTION_2", "Early Access Period")
+            .put("FEE_2", "55")
+            .put("DESCRIPTION_3", "Early Access Period")
+            .put("FEE_3", "45")
+            .build());
+    persistContactsAndHosts();
+    setEapForTld("tld");
+    doSuccessfulTest("tld", "domain_create_response_eap_fee.xml", FEE_06_MAP);
+  }
+
+  @Test
+  void testFailure_eapFee_totalAmountNotMatched_v06() {
+    setEppInput(
+        "domain_create_extra_fees.xml",
+        new ImmutableMap.Builder<String, String>()
+            .put("FEE_VERSION", "fee-0.6")
+            .put("DESCRIPTION_1", "create")
+            .put("FEE_1", "24")
+            .put("DESCRIPTION_2", "Early Access Period")
+            .put("FEE_2", "100")
+            .put("DESCRIPTION_3", "renew")
+            .put("FEE_3", "55")
+            .build());
+    persistContactsAndHosts();
+    setEapForTld("tld");
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertThat(thrown).hasMessageThat().contains("expected total of USD 124.00");
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_premiumAndEap_v06() throws Exception {
+    createTld("example");
+    setEppInput("domain_create_premium_eap.xml", FEE_06_MAP);
+    persistContactsAndHosts("net");
+    persistResource(
+        Tld.get("example")
+            .asBuilder()
+            .setEapFeeSchedule(
+                ImmutableSortedMap.of(
+                    START_OF_TIME,
+                    Money.of(USD, 0),
+                    clock.nowUtc().minusDays(1),
+                    Money.of(USD, 100),
+                    clock.nowUtc().plusDays(1),
+                    Money.of(USD, 0)))
+            .build());
+    assertMutatingFlow(true);
+    runFlowAssertResponse(
+        CommitMode.LIVE,
+        UserPrivileges.NORMAL,
+        loadFile("domain_create_response_premium_eap.xml", FEE_06_MAP));
+    assertSuccessfulCreate("example", ImmutableSet.of(), 200);
+    assertNoLordn();
+  }
+
+  @Test
+  void testFailure_premiumBlocked_v06() {
+    createTld("example");
+    setEppInput("domain_create_premium.xml", FEE_06_MAP);
+    persistContactsAndHosts("net");
+    // Modify the Registrar to block premium names.
+    persistResource(loadRegistrar("TheRegistrar").asBuilder().setBlockPremiumNames(true).build());
+    EppException thrown = assertThrows(PremiumNameBlockedException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_allocationToken_singleYearDiscount_worksForPremiums_v06() throws Exception {
+    createTld("example");
+    persistContactsAndHosts();
+    persistResource(
+        new AllocationToken.Builder()
+            .setToken("abc123")
+            .setTokenType(SINGLE_USE)
+            .setDomainName("rich.example")
+            .setDiscountFraction(0.95555)
+            .setDiscountPremiums(true)
+            .setTokenStatusTransitions(
+                ImmutableSortedMap.<DateTime, TokenStatus>naturalOrder()
+                    .put(START_OF_TIME, TokenStatus.NOT_STARTED)
+                    .put(clock.nowUtc().plusMillis(1), TokenStatus.VALID)
+                    .put(clock.nowUtc().plusSeconds(1), TokenStatus.ENDED)
+                    .build())
+            .build());
+    clock.advanceOneMilli();
+    setEppInput(
+        "domain_create_premium_allocationtoken.xml",
+        ImmutableMap.of("FEE_VERSION", "fee-0.6", "YEARS", "3", "FEE", "204.44"));
+    runFlowAssertResponse(
+        loadFile(
+            "domain_create_response_premium.xml",
+            ImmutableMap.of(
+                "FEE_VERSION", "fee-0.6", "EXDATE", "2002-04-03T22:00:00.0Z", "FEE", "204.44")));
+    BillingEvent billingEvent =
+        Iterables.getOnlyElement(DatabaseHelper.loadAllOf(BillingEvent.class));
+    assertThat(billingEvent.getTargetId()).isEqualTo("rich.example");
+    // 2yrs @ $100 + 1yr @ $100 * (1 - 0.95555) = $204.44
+    assertThat(billingEvent.getCost()).isEqualTo(Money.of(USD, 204.44));
+  }
+
+  @Test
+  void testTieredPricingPromo_registrarIncluded_noTokenActive_v12() throws Exception {
+    sessionMetadata.setRegistrarId("NewRegistrar");
+    persistActiveDomain("example1.tld");
+
+    persistResource(
+        setupDefaultTokenWithDiscount("NewRegistrar")
+            .asBuilder()
+            .setTokenStatusTransitions(
+                ImmutableSortedMap.of(
+                    START_OF_TIME,
+                    TokenStatus.NOT_STARTED,
+                    clock.nowUtc().plusDays(1),
+                    TokenStatus.VALID))
+            .build());
+
+    setEppInput("domain_create_fee.xml", FEE_12_MAP);
+    persistContactsAndHosts();
+
+    // The token hasn't started yet, so the cost should be create (13) plus renew (11)
+    runFlowAssertResponse(
+        loadFile(
+            "domain_create_response_fee.xml",
+            ImmutableMap.of("FEE_VERSION", "fee-0.12", "FEE", "24.00")));
+    assertThat(Iterables.getOnlyElement(loadAllOf(BillingEvent.class)).getCost())
+        .isEqualTo(Money.of(USD, 24));
+  }
+
+  @Test
+  void testTieredPricingPromo_registrarNotIncluded_standardResponse_v12() throws Exception {
+    setupDefaultTokenWithDiscount("NewRegistrar");
+    setEppInput("domain_create_fee.xml", FEE_12_MAP);
+    persistContactsAndHosts();
+
+    // For a registrar not included in the tiered pricing promo, costs should be 24
+    runFlowAssertResponse(
+        loadFile(
+            "domain_create_response_fee.xml",
+            ImmutableMap.of("FEE_VERSION", "fee-0.12", "FEE", "24.00")));
+    assertThat(Iterables.getOnlyElement(loadAllOf(BillingEvent.class)).getCost())
+        .isEqualTo(Money.of(USD, 24));
+  }
+
+  @Test
+  void testSuccess_nonAnchorTenant_nonPremiumRenewal_v06() throws Exception {
+    createTld("example");
+    AllocationToken token =
+        persistResource(
+            new AllocationToken.Builder()
+                .setToken("abc123")
+                .setTokenType(SINGLE_USE)
+                .setDomainName("rich.example")
+                .setRenewalPriceBehavior(NONPREMIUM)
+                .build());
+    persistContactsAndHosts();
+    // Creation is still $100 but it'll create a NONPREMIUM renewal
+    setEppInput(
+        "domain_create_premium_allocationtoken.xml",
+        ImmutableMap.of("FEE_VERSION", "fee-0.6", "YEARS", "2", "FEE", "111.00"));
+    runFlow();
+    assertSuccessfulCreate("example", ImmutableSet.of(), token, 111);
+  }
+
+  @Test
+  void testSuccess_specifiedRenewalPriceToken_specifiedRecurrencePrice_v06() throws Exception {
+    createTld("example");
+    AllocationToken token =
+        persistResource(
+            new AllocationToken.Builder()
+                .setToken("abc123")
+                .setTokenType(SINGLE_USE)
+                .setDomainName("rich.example")
+                .setRenewalPriceBehavior(SPECIFIED)
+                .setRenewalPrice(Money.of(USD, 1))
+                .build());
+    persistContactsAndHosts();
+    // Creation is still $100 but it'll create a $1 renewal
+    setEppInput(
+        "domain_create_premium_allocationtoken.xml",
+        ImmutableMap.of("FEE_VERSION", "fee-0.6", "YEARS", "2", "FEE", "101.00"));
+    runFlow();
+    assertSuccessfulCreate("example", ImmutableSet.of(), token, 101, 1);
+  }
+
   private AllocationToken setupDefaultTokenWithDiscount() {
     return setupDefaultTokenWithDiscount("TheRegistrar");
   }

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

@@ -1,440 +0,0 @@
-// 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.domain;
-
-import static com.google.common.truth.Truth.assertThat;
-import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_CREATE;
-import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_DELETE;
-import static google.registry.testing.DatabaseHelper.assertBillingEvents;
-import static google.registry.testing.DatabaseHelper.assertDomainDnsRequests;
-import static google.registry.testing.DatabaseHelper.assertPollMessages;
-import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.getOnlyHistoryEntryOfType;
-import static google.registry.testing.DatabaseHelper.getOnlyPollMessage;
-import static google.registry.testing.DatabaseHelper.getPollMessages;
-import static google.registry.testing.DatabaseHelper.loadByKey;
-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.util.DateTimeUtils.END_OF_TIME;
-import static google.registry.util.DateTimeUtils.START_OF_TIME;
-import static org.joda.money.CurrencyUnit.USD;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
-import google.registry.model.billing.BillingBase.Flag;
-import google.registry.model.billing.BillingBase.Reason;
-import google.registry.model.billing.BillingCancellation;
-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.domain.GracePeriod;
-import google.registry.model.domain.rgp.GracePeriodStatus;
-import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension;
-import google.registry.model.eppcommon.StatusValue;
-import google.registry.model.poll.PollMessage;
-import google.registry.model.tld.Tld;
-import google.registry.testing.DatabaseHelper;
-import java.util.Map;
-import java.util.Optional;
-import org.joda.money.Money;
-import org.joda.time.DateTime;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/** Tests for {@link DomainDeleteFlow} that use the old fee extensions (0.6, 0.11, 0.12). */
-public class DomainDeleteFlowOldFeeExtensionsTest
-    extends ProductionSimulatingFeeExtensionsTest<DomainDeleteFlow> {
-
-  private static final DateTime TIME_BEFORE_FLOW = DateTime.parse("2000-06-06T22:00:00.0Z");
-  private static final DateTime A_MONTH_AGO = TIME_BEFORE_FLOW.minusMonths(1);
-  private static final DateTime A_MONTH_FROM_NOW = TIME_BEFORE_FLOW.plusMonths(1);
-
-  private static final ImmutableMap<String, String> FEE_06_MAP =
-      ImmutableMap.of("FEE_VERSION", "fee-0.6", "FEE_NS", "fee");
-  private static final ImmutableMap<String, String> FEE_11_MAP =
-      ImmutableMap.of("FEE_VERSION", "fee-0.11", "FEE_NS", "fee11");
-  private static final ImmutableMap<String, String> FEE_12_MAP =
-      ImmutableMap.of("FEE_VERSION", "fee-0.12", "FEE_NS", "fee12");
-
-  private Domain domain;
-  private DomainHistory earlierHistoryEntry;
-
-  @BeforeEach
-  void beforeEachomainDeleteFlowOldFeeExtensionsTest() {
-    clock.setTo(TIME_BEFORE_FLOW);
-    setEppInput("domain_delete.xml");
-    createTld("tld");
-  }
-
-  @Test
-  void testSuccess_renewGracePeriodCredit_v06() throws Exception {
-    removeServiceExtensionUri(ServiceExtension.FEE_0_11.getUri());
-    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
-    doSuccessfulTest_noAddGracePeriod("domain_delete_response_pending_fee.xml", FEE_06_MAP);
-  }
-
-  @Test
-  void testSuccess_renewGracePeriodCredit_v11() throws Exception {
-    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
-    doSuccessfulTest_noAddGracePeriod("domain_delete_response_pending_fee.xml", FEE_11_MAP);
-  }
-
-  @Test
-  void testSuccess_renewGracePeriodCredit_v12() throws Exception {
-    doSuccessfulTest_noAddGracePeriod("domain_delete_response_pending_fee.xml", FEE_12_MAP);
-  }
-
-  @Test
-  void testSuccess_addGracePeriodCredit_v06() throws Exception {
-    removeServiceExtensionUri(ServiceExtension.FEE_0_11.getUri());
-    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
-    doAddGracePeriodDeleteTest(GracePeriodStatus.ADD, "domain_delete_response_fee.xml", FEE_06_MAP);
-  }
-
-  @Test
-  void testSuccess_addGracePeriodCredit_v11() throws Exception {
-    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
-    doAddGracePeriodDeleteTest(GracePeriodStatus.ADD, "domain_delete_response_fee.xml", FEE_11_MAP);
-  }
-
-  @Test
-  void testSuccess_addGracePeriodCredit_v12() throws Exception {
-    doAddGracePeriodDeleteTest(GracePeriodStatus.ADD, "domain_delete_response_fee.xml", FEE_12_MAP);
-  }
-
-  @Test
-  void testSuccess_autoRenewGracePeriod_v06() throws Exception {
-    removeServiceExtensionUri(ServiceExtension.FEE_0_11.getUri());
-    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
-    setUpAutorenewGracePeriod();
-    clock.advanceOneMilli();
-    runFlowAssertResponse(loadFile("domain_delete_response_autorenew_fee.xml", FEE_06_MAP));
-  }
-
-  @Test
-  void testSuccess_autoRenewGracePeriod_v11() throws Exception {
-    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
-    setUpAutorenewGracePeriod();
-    clock.advanceOneMilli();
-    runFlowAssertResponse(loadFile("domain_delete_response_autorenew_fee.xml", FEE_11_MAP));
-  }
-
-  @Test
-  void testSuccess_autoRenewGracePeriod_v12() throws Exception {
-    setUpAutorenewGracePeriod();
-    clock.advanceOneMilli();
-    runFlowAssertResponse(loadFile("domain_delete_response_autorenew_fee.xml", FEE_12_MAP));
-  }
-
-  @Test
-  void testSuccess_autoRenewGracePeriod_priceChanges_v06() throws Exception {
-    removeServiceExtensionUri(ServiceExtension.FEE_0_11.getUri());
-    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setRenewBillingCostTransitions(
-                ImmutableSortedMap.of(
-                    START_OF_TIME,
-                    Money.of(USD, 11),
-                    TIME_BEFORE_FLOW.minusDays(5),
-                    Money.of(USD, 20)))
-            .build());
-    setUpAutorenewGracePeriod();
-    clock.advanceOneMilli();
-    runFlowAssertResponse(loadFile("domain_delete_response_autorenew_fee.xml", FEE_06_MAP));
-  }
-
-  @Test
-  void testSuccess_autoRenewGracePeriod_priceChanges_v11() throws Exception {
-    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setRenewBillingCostTransitions(
-                ImmutableSortedMap.of(
-                    START_OF_TIME,
-                    Money.of(USD, 11),
-                    TIME_BEFORE_FLOW.minusDays(5),
-                    Money.of(USD, 20)))
-            .build());
-    setUpAutorenewGracePeriod();
-    clock.advanceOneMilli();
-    runFlowAssertResponse(loadFile("domain_delete_response_autorenew_fee.xml", FEE_11_MAP));
-  }
-
-  @Test
-  void testSuccess_autoRenewGracePeriod_priceChanges_v12() throws Exception {
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setRenewBillingCostTransitions(
-                ImmutableSortedMap.of(
-                    START_OF_TIME,
-                    Money.of(USD, 11),
-                    TIME_BEFORE_FLOW.minusDays(5),
-                    Money.of(USD, 20)))
-            .build());
-    setUpAutorenewGracePeriod();
-    clock.advanceOneMilli();
-    runFlowAssertResponse(loadFile("domain_delete_response_autorenew_fee.xml", FEE_12_MAP));
-  }
-
-  @Test
-  void testSuccess_freeCreation_deletionDuringGracePeriod_v12() throws Exception {
-    // Deletion during the add grace period should still work even if the credit is 0
-    setUpSuccessfulTest();
-    BillingEvent graceBillingEvent =
-        persistResource(createBillingEvent(Reason.CREATE, Money.of(USD, 0)));
-    setUpGracePeriods(
-        GracePeriod.forBillingEvent(GracePeriodStatus.ADD, domain.getRepoId(), graceBillingEvent));
-    clock.advanceOneMilli();
-    runFlowAssertResponse(loadFile("domain_delete_response_fee_free_grace_v12.xml"));
-  }
-
-  private void createReferencedEntities(DateTime expirationTime) throws Exception {
-    // Persist a linked contact.
-    Contact contact = persistActiveContact("sh8013");
-    domain =
-        persistResource(
-            DatabaseHelper.newDomain(getUniqueIdFromCommand())
-                .asBuilder()
-                .setCreationTimeForTest(TIME_BEFORE_FLOW)
-                .setRegistrant(Optional.of(contact.createVKey()))
-                .setRegistrationExpirationTime(expirationTime)
-                .build());
-    earlierHistoryEntry =
-        persistResource(
-            new DomainHistory.Builder()
-                .setType(DOMAIN_CREATE)
-                .setDomain(domain)
-                .setModificationTime(clock.nowUtc())
-                .setRegistrarId(domain.getCreationRegistrarId())
-                .build());
-  }
-
-  private void setUpSuccessfulTest() throws Exception {
-    createReferencedEntities(A_MONTH_FROM_NOW);
-    BillingRecurrence autorenewBillingEvent =
-        persistResource(createAutorenewBillingEvent("TheRegistrar").build());
-    PollMessage.Autorenew autorenewPollMessage =
-        persistResource(createAutorenewPollMessage("TheRegistrar").build());
-
-    domain =
-        persistResource(
-            domain
-                .asBuilder()
-                .setAutorenewBillingEvent(autorenewBillingEvent.createVKey())
-                .setAutorenewPollMessage(autorenewPollMessage.createVKey())
-                .build());
-
-    assertMutatingFlow(true);
-  }
-
-  private void doSuccessfulTest_noAddGracePeriod(String responseFilename) throws Exception {
-    doSuccessfulTest_noAddGracePeriod(responseFilename, ImmutableMap.of());
-  }
-
-  private void doSuccessfulTest_noAddGracePeriod(
-      String responseFilename, Map<String, String> substitutions) throws Exception {
-    // Persist the billing event so it can be retrieved for cancellation generation and checking.
-    setUpSuccessfulTest();
-    BillingEvent renewBillingEvent =
-        persistResource(createBillingEvent(Reason.RENEW, Money.of(USD, 456)));
-    setUpGracePeriods(
-        GracePeriod.forBillingEvent(GracePeriodStatus.RENEW, domain.getRepoId(), renewBillingEvent),
-        // This grace period has no associated billing event, so it won't cause a cancellation.
-        GracePeriod.create(
-            GracePeriodStatus.TRANSFER,
-            domain.getRepoId(),
-            TIME_BEFORE_FLOW.plusDays(1),
-            "NewRegistrar",
-            null));
-    // We should see exactly one poll message, which is for the autorenew 1 month in the future.
-    assertPollMessages(createAutorenewPollMessage("TheRegistrar").build());
-    DateTime expectedExpirationTime = domain.getRegistrationExpirationTime().minusYears(2);
-    clock.advanceOneMilli();
-    runFlowAssertResponse(loadFile(responseFilename, substitutions));
-    Domain resource = reloadResourceByForeignKey();
-    // Check that the domain is in the pending delete state.
-    assertAboutDomains()
-        .that(resource)
-        .hasStatusValue(StatusValue.PENDING_DELETE)
-        .and()
-        .hasDeletionTime(
-            clock
-                .nowUtc()
-                .plus(Tld.get("tld").getRedemptionGracePeriodLength())
-                .plus(Tld.get("tld").getPendingDeleteLength()))
-        .and()
-        .hasExactlyStatusValues(StatusValue.INACTIVE, StatusValue.PENDING_DELETE)
-        .and()
-        .hasOneHistoryEntryEachOfTypes(DOMAIN_CREATE, DOMAIN_DELETE);
-    // We leave the original expiration time unchanged; if the expiration time is before the
-    // deletion time, that means once it passes the domain will experience a "phantom autorenew"
-    // where the expirationTime advances and the grace period appears, but since the delete flow
-    // closed the autorenew recurrences immediately, there are no other autorenew effects.
-    assertAboutDomains().that(resource).hasRegistrationExpirationTime(expectedExpirationTime);
-    assertLastHistoryContainsResource(resource);
-    // All existing grace periods that were for billable actions should cause cancellations.
-    assertAutorenewClosedAndCancellationCreatedFor(
-        renewBillingEvent, getOnlyHistoryEntryOfType(resource, DOMAIN_DELETE, DomainHistory.class));
-    // All existing grace periods should be gone, and a new REDEMPTION one should be added.
-    assertThat(resource.getGracePeriods())
-        .containsExactly(
-            GracePeriod.create(
-                GracePeriodStatus.REDEMPTION,
-                domain.getRepoId(),
-                clock.nowUtc().plus(Tld.get("tld").getRedemptionGracePeriodLength()),
-                "TheRegistrar",
-                null,
-                resource.getGracePeriods().iterator().next().getGracePeriodId()));
-    assertDeletionPollMessageFor(resource, "Domain deleted.");
-  }
-
-  private void assertDeletionPollMessageFor(Domain domain, String expectedMessage) {
-    // There should be a future poll message at the deletion time. The previous autorenew poll
-    // message should now be deleted.
-    assertAboutDomains().that(domain).hasDeletePollMessage();
-    DateTime deletionTime = domain.getDeletionTime();
-    assertThat(getPollMessages("TheRegistrar", deletionTime.minusMinutes(1))).isEmpty();
-    assertThat(getPollMessages("TheRegistrar", deletionTime)).hasSize(1);
-    assertThat(domain.getDeletePollMessage())
-        .isEqualTo(getOnlyPollMessage("TheRegistrar").createVKey());
-    PollMessage.OneTime deletePollMessage = loadByKey(domain.getDeletePollMessage());
-    assertThat(deletePollMessage.getMsg()).isEqualTo(expectedMessage);
-  }
-
-  private void setUpGracePeriods(GracePeriod... gracePeriods) {
-    domain =
-        persistResource(
-            domain.asBuilder().setGracePeriods(ImmutableSet.copyOf(gracePeriods)).build());
-  }
-
-  private void assertAutorenewClosedAndCancellationCreatedFor(
-      BillingEvent graceBillingEvent, DomainHistory historyEntryDomainDelete) {
-    assertAutorenewClosedAndCancellationCreatedFor(
-        graceBillingEvent, historyEntryDomainDelete, clock.nowUtc());
-  }
-
-  private void assertAutorenewClosedAndCancellationCreatedFor(
-      BillingEvent graceBillingEvent, DomainHistory historyEntryDomainDelete, DateTime eventTime) {
-    assertBillingEvents(
-        createAutorenewBillingEvent("TheRegistrar").setRecurrenceEndTime(eventTime).build(),
-        graceBillingEvent,
-        new BillingCancellation.Builder()
-            .setReason(graceBillingEvent.getReason())
-            .setTargetId("example.tld")
-            .setRegistrarId("TheRegistrar")
-            .setEventTime(eventTime)
-            .setBillingTime(TIME_BEFORE_FLOW.plusDays(1))
-            .setBillingEvent(graceBillingEvent.createVKey())
-            .setDomainHistory(historyEntryDomainDelete)
-            .build());
-  }
-
-  private BillingRecurrence.Builder createAutorenewBillingEvent(String registrarId) {
-    return new BillingRecurrence.Builder()
-        .setReason(Reason.RENEW)
-        .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
-        .setTargetId("example.tld")
-        .setRegistrarId(registrarId)
-        .setEventTime(A_MONTH_FROM_NOW)
-        .setRecurrenceEndTime(END_OF_TIME)
-        .setDomainHistory(earlierHistoryEntry);
-  }
-
-  private PollMessage.Autorenew.Builder createAutorenewPollMessage(String registrarId) {
-    return new PollMessage.Autorenew.Builder()
-        .setTargetId("example.tld")
-        .setRegistrarId(registrarId)
-        .setEventTime(A_MONTH_FROM_NOW)
-        .setAutorenewEndTime(END_OF_TIME)
-        .setHistoryEntry(earlierHistoryEntry);
-  }
-
-  private BillingEvent createBillingEvent(Reason reason, Money cost) {
-    return new BillingEvent.Builder()
-        .setReason(reason)
-        .setTargetId("example.tld")
-        .setRegistrarId("TheRegistrar")
-        .setCost(cost)
-        .setPeriodYears(2)
-        .setEventTime(TIME_BEFORE_FLOW.minusDays(4))
-        .setBillingTime(TIME_BEFORE_FLOW.plusDays(1))
-        .setDomainHistory(earlierHistoryEntry)
-        .build();
-  }
-
-  private void doAddGracePeriodDeleteTest(
-      GracePeriodStatus gracePeriodStatus, String responseFilename) throws Exception {
-    doAddGracePeriodDeleteTest(gracePeriodStatus, responseFilename, ImmutableMap.of());
-  }
-
-  private void doAddGracePeriodDeleteTest(
-      GracePeriodStatus gracePeriodStatus,
-      String responseFilename,
-      Map<String, String> substitutions)
-      throws Exception {
-    // Persist the billing event so it can be retrieved for cancellation generation and checking.
-    setUpSuccessfulTest();
-    BillingEvent graceBillingEvent =
-        persistResource(createBillingEvent(Reason.CREATE, Money.of(USD, 123)));
-    setUpGracePeriods(
-        GracePeriod.forBillingEvent(gracePeriodStatus, domain.getRepoId(), graceBillingEvent));
-    // We should see exactly one poll message, which is for the autorenew 1 month in the future.
-    assertPollMessages(createAutorenewPollMessage("TheRegistrar").build());
-    clock.advanceOneMilli();
-    runFlowAssertResponse(loadFile(responseFilename, substitutions));
-    // Check that the domain is fully deleted.
-    assertThat(reloadResourceByForeignKey()).isNull();
-    // The add grace period is for a billable action, so it should trigger a cancellation.
-    assertAutorenewClosedAndCancellationCreatedFor(
-        graceBillingEvent, getOnlyHistoryEntryOfType(domain, DOMAIN_DELETE, DomainHistory.class));
-    assertDomainDnsRequests("example.tld");
-    // There should be no poll messages. The previous autorenew poll message should now be deleted.
-    assertThat(getPollMessages("TheRegistrar")).isEmpty();
-  }
-
-  private void setUpAutorenewGracePeriod() throws Exception {
-    createReferencedEntities(A_MONTH_AGO.plusYears(1));
-    BillingRecurrence autorenewBillingEvent =
-        persistResource(
-            createAutorenewBillingEvent("TheRegistrar").setEventTime(A_MONTH_AGO).build());
-    PollMessage.Autorenew autorenewPollMessage =
-        persistResource(
-            createAutorenewPollMessage("TheRegistrar").setEventTime(A_MONTH_AGO).build());
-    domain =
-        persistResource(
-            domain
-                .asBuilder()
-                .setGracePeriods(
-                    ImmutableSet.of(
-                        GracePeriod.createForRecurrence(
-                            GracePeriodStatus.AUTO_RENEW,
-                            domain.getRepoId(),
-                            A_MONTH_AGO.plusDays(45),
-                            "TheRegistrar",
-                            autorenewBillingEvent.createVKey())))
-                .setAutorenewBillingEvent(autorenewBillingEvent.createVKey())
-                .setAutorenewPollMessage(autorenewPollMessage.createVKey())
-                .build());
-    assertMutatingFlow(true);
-  }
-}

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

@@ -86,6 +86,7 @@ import google.registry.model.domain.Domain;
 import google.registry.model.domain.DomainHistory;
 import google.registry.model.domain.GracePeriod;
 import google.registry.model.domain.rgp.GracePeriodStatus;
+import google.registry.model.eppcommon.ProtocolDefinition.ServiceExtension;
 import google.registry.model.eppcommon.StatusValue;
 import google.registry.model.eppcommon.Trid;
 import google.registry.model.host.Host;
@@ -121,6 +122,12 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
   private static final DateTime A_MONTH_AGO = TIME_BEFORE_FLOW.minusMonths(1);
   private static final DateTime A_MONTH_FROM_NOW = TIME_BEFORE_FLOW.plusMonths(1);
 
+  private static final ImmutableMap<String, String> FEE_06_MAP =
+      ImmutableMap.of("FEE_VERSION", "fee-0.6", "FEE_NS", "fee");
+  private static final ImmutableMap<String, String> FEE_11_MAP =
+      ImmutableMap.of("FEE_VERSION", "fee-0.11", "FEE_NS", "fee11");
+  private static final ImmutableMap<String, String> FEE_12_MAP =
+      ImmutableMap.of("FEE_VERSION", "fee-0.12", "FEE_NS", "fee12");
   private static final ImmutableMap<String, String> FEE_STD_1_0_MAP =
       ImmutableMap.of("FEE_VERSION", "epp:fee-1.0", "FEE_NS", "fee1_00");
 
@@ -1233,4 +1240,144 @@ class DomainDeleteFlowTest extends ResourceFlowTestCase<DomainDeleteFlow, Domain
                 + "history_registrar_id,history_modification_time,history_other_registrar_id,"
                 + "history_period_unit,history_period_value,history_reason,history");
   }
+
+  @Test
+  void testSuccess_renewGracePeriodCredit_v06() throws Exception {
+    removeServiceExtensionUri(ServiceExtension.FEE_0_11.getUri());
+    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    doSuccessfulTest_noAddGracePeriod("domain_delete_response_pending_fee.xml", FEE_06_MAP);
+  }
+
+  @Test
+  void testSuccess_renewGracePeriodCredit_v11() throws Exception {
+    setEppInput("domain_delete.xml", FEE_11_MAP);
+    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    doSuccessfulTest_noAddGracePeriod("domain_delete_response_pending_fee.xml", FEE_11_MAP);
+  }
+
+  @Test
+  void testSuccess_renewGracePeriodCredit_v12() throws Exception {
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    doSuccessfulTest_noAddGracePeriod("domain_delete_response_pending_fee.xml", FEE_12_MAP);
+  }
+
+  @Test
+  void testSuccess_addGracePeriodCredit_v06() throws Exception {
+    removeServiceExtensionUri(ServiceExtension.FEE_0_11.getUri());
+    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    doAddGracePeriodDeleteTest(GracePeriodStatus.ADD, "domain_delete_response_fee.xml", FEE_06_MAP);
+  }
+
+  @Test
+  void testSuccess_addGracePeriodCredit_v11() throws Exception {
+    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    doAddGracePeriodDeleteTest(GracePeriodStatus.ADD, "domain_delete_response_fee.xml", FEE_11_MAP);
+  }
+
+  @Test
+  void testSuccess_addGracePeriodCredit_v12() throws Exception {
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    doAddGracePeriodDeleteTest(GracePeriodStatus.ADD, "domain_delete_response_fee.xml", FEE_12_MAP);
+  }
+
+  @Test
+  void testSuccess_autoRenewGracePeriod_v06() throws Exception {
+    removeServiceExtensionUri(ServiceExtension.FEE_0_11.getUri());
+    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    setUpAutorenewGracePeriod();
+    clock.advanceOneMilli();
+    runFlowAssertResponse(loadFile("domain_delete_response_autorenew_fee.xml", FEE_06_MAP));
+  }
+
+  @Test
+  void testSuccess_autoRenewGracePeriod_v11() throws Exception {
+    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    setUpAutorenewGracePeriod();
+    clock.advanceOneMilli();
+    runFlowAssertResponse(loadFile("domain_delete_response_autorenew_fee.xml", FEE_11_MAP));
+  }
+
+  @Test
+  void testSuccess_autoRenewGracePeriod_v12() throws Exception {
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    setUpAutorenewGracePeriod();
+    clock.advanceOneMilli();
+    runFlowAssertResponse(loadFile("domain_delete_response_autorenew_fee.xml", FEE_12_MAP));
+  }
+
+  @Test
+  void testSuccess_autoRenewGracePeriod_priceChanges_v06() throws Exception {
+    removeServiceExtensionUri(ServiceExtension.FEE_0_11.getUri());
+    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setRenewBillingCostTransitions(
+                ImmutableSortedMap.of(
+                    START_OF_TIME,
+                    Money.of(USD, 11),
+                    TIME_BEFORE_FLOW.minusDays(5),
+                    Money.of(USD, 20)))
+            .build());
+    setUpAutorenewGracePeriod();
+    clock.advanceOneMilli();
+    runFlowAssertResponse(loadFile("domain_delete_response_autorenew_fee.xml", FEE_06_MAP));
+  }
+
+  @Test
+  void testSuccess_autoRenewGracePeriod_priceChanges_v11() throws Exception {
+    removeServiceExtensionUri(ServiceExtension.FEE_0_12.getUri());
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setRenewBillingCostTransitions(
+                ImmutableSortedMap.of(
+                    START_OF_TIME,
+                    Money.of(USD, 11),
+                    TIME_BEFORE_FLOW.minusDays(5),
+                    Money.of(USD, 20)))
+            .build());
+    setUpAutorenewGracePeriod();
+    clock.advanceOneMilli();
+    runFlowAssertResponse(loadFile("domain_delete_response_autorenew_fee.xml", FEE_11_MAP));
+  }
+
+  @Test
+  void testSuccess_autoRenewGracePeriod_priceChanges_v12() throws Exception {
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setRenewBillingCostTransitions(
+                ImmutableSortedMap.of(
+                    START_OF_TIME,
+                    Money.of(USD, 11),
+                    TIME_BEFORE_FLOW.minusDays(5),
+                    Money.of(USD, 20)))
+            .build());
+    setUpAutorenewGracePeriod();
+    clock.advanceOneMilli();
+    runFlowAssertResponse(loadFile("domain_delete_response_autorenew_fee.xml", FEE_12_MAP));
+  }
+
+  @Test
+  void testSuccess_freeCreation_deletionDuringGracePeriod_v12() throws Exception {
+    removeServiceExtensionUri(ServiceExtension.FEE_1_00.getUri());
+    // Deletion during the add grace period should still work even if the credit is 0
+    setUpSuccessfulTest();
+    BillingEvent graceBillingEvent =
+        persistResource(createBillingEvent(Reason.CREATE, Money.of(USD, 0)));
+    setUpGracePeriods(
+        GracePeriod.forBillingEvent(GracePeriodStatus.ADD, domain.getRepoId(), graceBillingEvent));
+    clock.advanceOneMilli();
+    runFlowAssertResponse(loadFile("domain_delete_response_fee_free_grace_v12.xml"));
+  }
 }

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

@@ -1,523 +0,0 @@
-// 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.domain;
-
-import static google.registry.model.billing.BillingBase.RenewalPriceBehavior.DEFAULT;
-import static google.registry.model.billing.BillingBase.RenewalPriceBehavior.NONPREMIUM;
-import static google.registry.model.billing.BillingBase.RenewalPriceBehavior.SPECIFIED;
-import static google.registry.testing.DatabaseHelper.assertNoBillingEvents;
-import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.persistActiveHost;
-import static google.registry.testing.DatabaseHelper.persistBillingRecurrenceForDomain;
-import static google.registry.testing.DatabaseHelper.persistPremiumList;
-import static google.registry.testing.DatabaseHelper.persistResource;
-import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions;
-import static google.registry.testing.TestDataHelper.updateSubstitutions;
-import static org.joda.money.CurrencyUnit.USD;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import google.registry.flows.EppException;
-import google.registry.flows.FlowUtils.UnknownCurrencyEppException;
-import google.registry.flows.domain.DomainFlowUtils.BadPeriodUnitException;
-import google.registry.flows.domain.DomainFlowUtils.CurrencyUnitMismatchException;
-import google.registry.flows.domain.DomainFlowUtils.FeeChecksDontSupportPhasesException;
-import google.registry.flows.domain.DomainFlowUtils.RestoresAreAlwaysForOneYearException;
-import google.registry.flows.domain.DomainFlowUtils.TransfersAreAlwaysForOneYearException;
-import google.registry.model.billing.BillingBase.RenewalPriceBehavior;
-import google.registry.model.domain.Domain;
-import google.registry.model.domain.DomainAuthInfo;
-import google.registry.model.eppcommon.AuthInfo.PasswordAuth;
-import google.registry.model.eppcommon.StatusValue;
-import google.registry.model.host.Host;
-import google.registry.model.tld.Tld;
-import google.registry.persistence.transaction.JpaTransactionManagerExtension;
-import java.util.regex.Pattern;
-import javax.annotation.Nullable;
-import org.joda.money.Money;
-import org.joda.time.DateTime;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/** Tests for {@link DomainInfoFlow} that use the old fee extensions (0.6, 0.11, 0.12). */
-public class DomainInfoFlowOldFeeExtensionsTest
-    extends ProductionSimulatingFeeExtensionsTest<DomainInfoFlow> {
-
-  /**
-   * The domain_info_fee.xml default substitutions common to most tests.
-   *
-   * <p>It doesn't set a default value to the COMMAND and PERIOD keys, because they are different in
-   * every test.
-   */
-  private static final ImmutableMap<String, String> SUBSTITUTION_BASE =
-      ImmutableMap.of(
-          "NAME", "example.tld",
-          "CURRENCY", "USD",
-          "UNIT", "y");
-
-  private static final Pattern OK_PATTERN = Pattern.compile("\"ok\"");
-
-  private Host host1;
-  private Host host2;
-  private Host host3;
-  private Domain domain;
-
-  @BeforeEach
-  void beforeEachDomainInfoFlowOldFeeExtensionsTest() {
-    setEppInput("domain_info.xml");
-    clock.setTo(DateTime.parse("2005-03-03T22:00:00.000Z"));
-    sessionMetadata.setRegistrarId("NewRegistrar");
-    createTld("tld");
-    persistResource(
-        JpaTransactionManagerExtension.makeRegistrar1()
-            .asBuilder()
-            .setRegistrarId("ClientZ")
-            .build());
-  }
-
-  private void persistTestEntities(String domainName, boolean inactive) {
-    host1 = persistActiveHost("ns1.example.tld");
-    host2 = persistActiveHost("ns1.example.net");
-    domain =
-        persistResource(
-            new Domain.Builder()
-                .setDomainName(domainName)
-                .setRepoId("2FF-TLD")
-                .setPersistedCurrentSponsorRegistrarId("NewRegistrar")
-                .setCreationRegistrarId("TheRegistrar")
-                .setLastEppUpdateRegistrarId("NewRegistrar")
-                .setCreationTimeForTest(DateTime.parse("1999-04-03T22:00:00.0Z"))
-                .setLastEppUpdateTime(DateTime.parse("1999-12-03T09:00:00.0Z"))
-                .setLastTransferTime(DateTime.parse("2000-04-08T09:00:00.0Z"))
-                .setRegistrationExpirationTime(DateTime.parse("2005-04-03T22:00:00.0Z"))
-                .setNameservers(
-                    inactive ? null : ImmutableSet.of(host1.createVKey(), host2.createVKey()))
-                .setAuthInfo(DomainAuthInfo.create(PasswordAuth.create("2fooBAR")))
-                .build());
-    // Set the superordinate domain of ns1.example.com to example.com. In reality, this would have
-    // happened in the flow that created it, but here we just overwrite it in the database.
-    host1 = persistResource(host1.asBuilder().setSuperordinateDomain(domain.createVKey()).build());
-    // Create a subordinate host that is not delegated to by anyone.
-    host3 =
-        persistResource(
-            new Host.Builder()
-                .setHostName("ns2.example.tld")
-                .setRepoId("3FF-TLD")
-                .setSuperordinateDomain(domain.createVKey())
-                .build());
-    // Add the subordinate host keys to the existing domain.
-    domain =
-        persistResource(
-            domain
-                .asBuilder()
-                .setSubordinateHosts(ImmutableSet.of(host1.getHostName(), host3.getHostName()))
-                .build());
-  }
-
-  private void persistTestEntities(boolean inactive) {
-    persistTestEntities("example.tld", inactive);
-  }
-
-  private void doSuccessfulTest(
-      String expectedXmlFilename,
-      boolean inactive,
-      ImmutableMap<String, String> substitutions,
-      boolean expectHistoryAndBilling)
-      throws Exception {
-    assertMutatingFlow(true);
-    String expected =
-        loadFile(expectedXmlFilename, updateSubstitutions(substitutions, "ROID", "2FF-TLD"));
-    if (inactive) {
-      expected = OK_PATTERN.matcher(expected).replaceAll("\"inactive\"");
-    }
-    runFlowAssertResponse(expected);
-    if (!expectHistoryAndBilling) {
-      assertNoHistory();
-      assertNoBillingEvents();
-    }
-  }
-
-  private void doSuccessfulTest(String expectedXmlFilename, boolean inactive) throws Exception {
-    doSuccessfulTest(expectedXmlFilename, inactive, ImmutableMap.of(), false);
-  }
-
-  private void doSuccessfulTest(String expectedXmlFilename) throws Exception {
-    persistTestEntities(false);
-    doSuccessfulTest(expectedXmlFilename, false);
-  }
-
-  private void doSuccessfulTestNoNameservers(String expectedXmlFilename) throws Exception {
-    persistTestEntities(true);
-    doSuccessfulTest(expectedXmlFilename, true);
-  }
-
-  /** sets up a sample recurring billing event as part of the domain creation process. */
-  private void setUpBillingEventForExistingDomain() {
-    setUpBillingEventForExistingDomain(DEFAULT, null);
-  }
-
-  private void setUpBillingEventForExistingDomain(
-      RenewalPriceBehavior renewalPriceBehavior, @Nullable Money renewalPrice) {
-    domain = persistBillingRecurrenceForDomain(domain, renewalPriceBehavior, renewalPrice);
-  }
-
-  @Test
-  void testFeeExtension_restoreCommand_pendingDelete_withRenewal() throws Exception {
-    createTld("example");
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(
-            SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "restore", "PERIOD", "1"));
-    persistTestEntities("rich.example", false);
-    setUpBillingEventForExistingDomain();
-    persistResource(
-        domain
-            .asBuilder()
-            .setDeletionTime(clock.nowUtc().plusDays(25))
-            .setRegistrationExpirationTime(clock.nowUtc().minusDays(1))
-            .setStatusValues(ImmutableSet.of(StatusValue.PENDING_DELETE))
-            .build());
-    doSuccessfulTest(
-        "domain_info_fee_restore_response_with_renewal.xml", false, ImmutableMap.of(), true);
-  }
-
-  /**
-   * Test create command. Fee extension version 6 is the only one which supports fee extensions on
-   * info commands and responses, so we don't need to test the other versions.
-   */
-  @Test
-  void testFeeExtension_createCommand() throws Exception {
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "create", "PERIOD", "2"));
-    persistTestEntities(false);
-    setUpBillingEventForExistingDomain();
-    doSuccessfulTest(
-        "domain_info_fee_response.xml",
-        false,
-        ImmutableMap.of(
-            "COMMAND", "create",
-            "DESCRIPTION", "create",
-            "PERIOD", "2",
-            "FEE", "24.00"),
-        true);
-  }
-
-  /** Test renew command. */
-  @Test
-  void testFeeExtension_renewCommand() throws Exception {
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "2"));
-    persistTestEntities(false);
-    setUpBillingEventForExistingDomain();
-    doSuccessfulTest(
-        "domain_info_fee_response.xml",
-        false,
-        ImmutableMap.of(
-            "COMMAND", "renew",
-            "DESCRIPTION", "renew",
-            "PERIOD", "2",
-            "FEE", "22.00"),
-        true);
-  }
-
-  /** Test transfer command. */
-  @Test
-  void testFeeExtension_transferCommand() throws Exception {
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "transfer", "PERIOD", "1"));
-    persistTestEntities(false);
-    setUpBillingEventForExistingDomain();
-    doSuccessfulTest(
-        "domain_info_fee_response.xml",
-        false,
-        ImmutableMap.of(
-            "COMMAND", "transfer",
-            "DESCRIPTION", "renew",
-            "PERIOD", "1",
-            "FEE", "11.00"),
-        true);
-  }
-
-  /** Test restore command. */
-  @Test
-  void testFeeExtension_restoreCommand() throws Exception {
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "restore", "PERIOD", "1"));
-    persistTestEntities(false);
-    setUpBillingEventForExistingDomain();
-    doSuccessfulTest("domain_info_fee_restore_response.xml", false, ImmutableMap.of(), true);
-  }
-
-  @Test
-  void testFeeExtension_restoreCommand_pendingDelete_noRenewal() throws Exception {
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "restore", "PERIOD", "1"));
-    persistTestEntities(false);
-    setUpBillingEventForExistingDomain();
-    persistResource(
-        domain
-            .asBuilder()
-            .setDeletionTime(clock.nowUtc().plusDays(25))
-            .setStatusValues(ImmutableSet.of(StatusValue.PENDING_DELETE))
-            .build());
-    doSuccessfulTest(
-        "domain_info_fee_restore_response_no_renewal.xml", false, ImmutableMap.of(), true);
-  }
-
-  /** Test create command on a premium label. */
-  @Test
-  void testFeeExtension_createCommandPremium() throws Exception {
-    createTld("example");
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(
-            SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "create", "PERIOD", "1"));
-    persistTestEntities("rich.example", false);
-    setUpBillingEventForExistingDomain();
-    doSuccessfulTest(
-        "domain_info_fee_premium_response.xml",
-        false,
-        ImmutableMap.of("COMMAND", "create", "DESCRIPTION", "create"),
-        true);
-  }
-
-  /** Test renew command on a premium label. */
-  @Test
-  void testFeeExtension_renewCommandPremium() throws Exception {
-    createTld("example");
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(
-            SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "renew", "PERIOD", "1"));
-    persistTestEntities("rich.example", false);
-    setUpBillingEventForExistingDomain();
-    doSuccessfulTest(
-        "domain_info_fee_premium_response.xml",
-        false,
-        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew"),
-        true);
-  }
-
-  @Test
-  void testFeeExtension_renewCommandPremium_anchorTenant() throws Exception {
-    createTld("tld");
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setPremiumList(persistPremiumList("tld", USD, "example,USD 70"))
-            .build());
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "1"));
-    persistTestEntities("example.tld", false);
-    setUpBillingEventForExistingDomain(NONPREMIUM, null);
-    doSuccessfulTest(
-        "domain_info_fee_response.xml",
-        false,
-        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew", "FEE", "11.00", "PERIOD", "1"),
-        true);
-  }
-
-  @Test
-  void testFeeExtension_renewCommandPremium_internalRegistration() throws Exception {
-    createTld("tld");
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setPremiumList(persistPremiumList("tld", USD, "example,USD 70"))
-            .build());
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "1"));
-    persistTestEntities("example.tld", false);
-    setUpBillingEventForExistingDomain(SPECIFIED, Money.of(USD, 3));
-    doSuccessfulTest(
-        "domain_info_fee_response.xml",
-        false,
-        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew", "FEE", "3.00", "PERIOD", "1"),
-        true);
-  }
-
-  @Test
-  void testFeeExtension_renewCommandPremium_anchorTenant_multiYear() throws Exception {
-    createTld("tld");
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setPremiumList(persistPremiumList("tld", USD, "example,USD 70"))
-            .build());
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "3"));
-    persistTestEntities("example.tld", false);
-    setUpBillingEventForExistingDomain(NONPREMIUM, null);
-    doSuccessfulTest(
-        "domain_info_fee_response.xml",
-        false,
-        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew", "FEE", "33.00", "PERIOD", "3"),
-        true);
-  }
-
-  @Test
-  void testFeeExtension_renewCommandPremium_internalRegistration_multiYear() throws Exception {
-    createTld("tld");
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setPremiumList(persistPremiumList("tld", USD, "example,USD 70"))
-            .build());
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "3"));
-    persistTestEntities("example.tld", false);
-    setUpBillingEventForExistingDomain(SPECIFIED, Money.of(USD, 3));
-    doSuccessfulTest(
-        "domain_info_fee_response.xml",
-        false,
-        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew", "FEE", "9.00", "PERIOD", "3"),
-        true);
-  }
-
-  @Test
-  void testFeeExtension_renewCommandStandard_internalRegistration() throws Exception {
-    createTld("tld");
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "1"));
-    persistTestEntities("example.tld", false);
-    setUpBillingEventForExistingDomain(SPECIFIED, Money.of(USD, 3));
-    doSuccessfulTest(
-        "domain_info_fee_response.xml",
-        false,
-        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew", "FEE", "3.00", "PERIOD", "1"),
-        true);
-  }
-
-  /** Test transfer command on a premium label. */
-  @Test
-  void testFeeExtension_transferCommandPremium() throws Exception {
-    createTld("example");
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(
-            SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "transfer", "PERIOD", "1"));
-    persistTestEntities("rich.example", false);
-    setUpBillingEventForExistingDomain();
-    doSuccessfulTest(
-        "domain_info_fee_premium_response.xml",
-        false,
-        ImmutableMap.of("COMMAND", "transfer", "DESCRIPTION", "renew"),
-        true);
-  }
-
-  /** Test restore command on a premium label. */
-  @Test
-  void testFeeExtension_restoreCommandPremium() throws Exception {
-    createTld("example");
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(
-            SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "restore", "PERIOD", "1"));
-    persistTestEntities("rich.example", false);
-    setUpBillingEventForExistingDomain();
-    doSuccessfulTest(
-        "domain_info_fee_restore_premium_response.xml", false, ImmutableMap.of(), true);
-  }
-
-  /** Test setting the currency explicitly to a wrong value. */
-  @Test
-  void testFeeExtension_wrongCurrency() {
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(
-            SUBSTITUTION_BASE, "COMMAND", "create", "CURRENCY", "EUR", "PERIOD", "1"));
-    persistTestEntities(false);
-    setUpBillingEventForExistingDomain();
-    EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  /** Test requesting a period that isn't in years. */
-  @Test
-  void testFeeExtension_periodNotInYears() {
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "create", "PERIOD", "2", "UNIT", "m"));
-    persistTestEntities(false);
-    setUpBillingEventForExistingDomain();
-    EppException thrown = assertThrows(BadPeriodUnitException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  /** Test a command that specifies a phase. */
-  @Test
-  void testFeeExtension_commandPhase() {
-    setEppInput("domain_info_fee_command_phase.xml");
-    persistTestEntities(false);
-    setUpBillingEventForExistingDomain();
-    EppException thrown = assertThrows(FeeChecksDontSupportPhasesException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  /** Test a command that specifies a subphase. */
-  @Test
-  void testFeeExtension_commandSubphase() {
-    setEppInput("domain_info_fee_command_subphase.xml");
-    persistTestEntities(false);
-    setUpBillingEventForExistingDomain();
-    EppException thrown = assertThrows(FeeChecksDontSupportPhasesException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  /** Test a restore for more than one year. */
-  @Test
-  void testFeeExtension_multiyearRestore() {
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "restore", "PERIOD", "2"));
-    persistTestEntities(false);
-    setUpBillingEventForExistingDomain();
-    EppException thrown = assertThrows(RestoresAreAlwaysForOneYearException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  /** Test a transfer for more than one year. */
-  @Test
-  void testFeeExtension_multiyearTransfer() {
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "transfer", "PERIOD", "2"));
-    persistTestEntities(false);
-    setUpBillingEventForExistingDomain();
-    EppException thrown = assertThrows(TransfersAreAlwaysForOneYearException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFeeExtension_unknownCurrency() {
-    setEppInput(
-        "domain_info_fee.xml",
-        updateSubstitutions(
-            SUBSTITUTION_BASE, "COMMAND", "create", "CURRENCY", "BAD", "PERIOD", "1"));
-    EppException thrown = assertThrows(UnknownCurrencyEppException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-}

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

@@ -17,12 +17,15 @@ package google.registry.flows.domain;
 import static com.google.common.io.BaseEncoding.base16;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.model.billing.BillingBase.RenewalPriceBehavior.DEFAULT;
+import static google.registry.model.billing.BillingBase.RenewalPriceBehavior.NONPREMIUM;
+import static google.registry.model.billing.BillingBase.RenewalPriceBehavior.SPECIFIED;
 import static google.registry.model.eppcommon.EppXmlTransformer.marshal;
 import static google.registry.model.tld.Tld.TldState.QUIET_PERIOD;
 import static google.registry.testing.DatabaseHelper.assertNoBillingEvents;
 import static google.registry.testing.DatabaseHelper.createTld;
 import static google.registry.testing.DatabaseHelper.persistActiveHost;
 import static google.registry.testing.DatabaseHelper.persistBillingRecurrenceForDomain;
+import static google.registry.testing.DatabaseHelper.persistPremiumList;
 import static google.registry.testing.DatabaseHelper.persistResource;
 import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions;
 import static google.registry.testing.TestDataHelper.updateSubstitutions;
@@ -38,9 +41,15 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSortedMap;
 import google.registry.flows.EppException;
 import google.registry.flows.FlowUtils.NotLoggedInException;
+import google.registry.flows.FlowUtils.UnknownCurrencyEppException;
 import google.registry.flows.ResourceFlowTestCase;
 import google.registry.flows.ResourceFlowUtils.BadAuthInfoForResourceException;
 import google.registry.flows.ResourceFlowUtils.ResourceDoesNotExistException;
+import google.registry.flows.domain.DomainFlowUtils.BadPeriodUnitException;
+import google.registry.flows.domain.DomainFlowUtils.CurrencyUnitMismatchException;
+import google.registry.flows.domain.DomainFlowUtils.FeeChecksDontSupportPhasesException;
+import google.registry.flows.domain.DomainFlowUtils.RestoresAreAlwaysForOneYearException;
+import google.registry.flows.domain.DomainFlowUtils.TransfersAreAlwaysForOneYearException;
 import google.registry.model.billing.BillingBase.Flag;
 import google.registry.model.billing.BillingBase.Reason;
 import google.registry.model.billing.BillingBase.RenewalPriceBehavior;
@@ -663,4 +672,353 @@ class DomainInfoFlowTest extends ResourceFlowTestCase<DomainInfoFlow, Domain> {
     setEppInput("domain_info_bulk.xml");
     doSuccessfulTest("domain_info_response_unauthorized.xml", false);
   }
+
+  // The fee extension is no longer supported in domain:info commands as of version 1.0.
+  // For now, we still support old versions.
+  @Test
+  void testFeeExtension_restoreCommand_pendingDelete_withRenewal() throws Exception {
+    createTld("example");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "restore", "PERIOD", "1"));
+    persistTestEntities("rich.example", false);
+    setUpBillingEventForExistingDomain();
+    persistResource(
+        domain
+            .asBuilder()
+            .setDeletionTime(clock.nowUtc().plusDays(25))
+            .setRegistrationExpirationTime(clock.nowUtc().minusDays(1))
+            .setStatusValues(ImmutableSet.of(StatusValue.PENDING_DELETE))
+            .build());
+    doSuccessfulTest(
+        "domain_info_fee_restore_response_with_renewal.xml", false, ImmutableMap.of(), true);
+  }
+
+  /**
+   * Test create command. Fee extension version 6 is the only one which supports fee extensions on
+   * info commands and responses, so we don't need to test the other versions.
+   */
+  @Test
+  void testFeeExtension_createCommand() throws Exception {
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "create", "PERIOD", "2"));
+    persistTestEntities(false);
+    setUpBillingEventForExistingDomain();
+    doSuccessfulTest(
+        "domain_info_fee_response.xml",
+        false,
+        ImmutableMap.of(
+            "COMMAND", "create",
+            "DESCRIPTION", "create",
+            "PERIOD", "2",
+            "FEE", "24.00"),
+        true);
+  }
+
+  /** Test renew command. */
+  @Test
+  void testFeeExtension_renewCommand() throws Exception {
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "2"));
+    persistTestEntities(false);
+    setUpBillingEventForExistingDomain();
+    doSuccessfulTest(
+        "domain_info_fee_response.xml",
+        false,
+        ImmutableMap.of(
+            "COMMAND", "renew",
+            "DESCRIPTION", "renew",
+            "PERIOD", "2",
+            "FEE", "22.00"),
+        true);
+  }
+
+  /** Test transfer command. */
+  @Test
+  void testFeeExtension_transferCommand() throws Exception {
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "transfer", "PERIOD", "1"));
+    persistTestEntities(false);
+    setUpBillingEventForExistingDomain();
+    doSuccessfulTest(
+        "domain_info_fee_response.xml",
+        false,
+        ImmutableMap.of(
+            "COMMAND", "transfer",
+            "DESCRIPTION", "renew",
+            "PERIOD", "1",
+            "FEE", "11.00"),
+        true);
+  }
+
+  /** Test restore command. */
+  @Test
+  void testFeeExtension_restoreCommand() throws Exception {
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "restore", "PERIOD", "1"));
+    persistTestEntities(false);
+    setUpBillingEventForExistingDomain();
+    doSuccessfulTest("domain_info_fee_restore_response.xml", false, ImmutableMap.of(), true);
+  }
+
+  @Test
+  void testFeeExtension_restoreCommand_pendingDelete_noRenewal() throws Exception {
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "restore", "PERIOD", "1"));
+    persistTestEntities(false);
+    setUpBillingEventForExistingDomain();
+    persistResource(
+        domain
+            .asBuilder()
+            .setDeletionTime(clock.nowUtc().plusDays(25))
+            .setStatusValues(ImmutableSet.of(StatusValue.PENDING_DELETE))
+            .build());
+    doSuccessfulTest(
+        "domain_info_fee_restore_response_no_renewal.xml", false, ImmutableMap.of(), true);
+  }
+
+  /** Test create command on a premium label. */
+  @Test
+  void testFeeExtension_createCommandPremium() throws Exception {
+    createTld("example");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "create", "PERIOD", "1"));
+    persistTestEntities("rich.example", false);
+    setUpBillingEventForExistingDomain();
+    doSuccessfulTest(
+        "domain_info_fee_premium_response.xml",
+        false,
+        ImmutableMap.of("COMMAND", "create", "DESCRIPTION", "create"),
+        true);
+  }
+
+  /** Test renew command on a premium label. */
+  @Test
+  void testFeeExtension_renewCommandPremium() throws Exception {
+    createTld("example");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "renew", "PERIOD", "1"));
+    persistTestEntities("rich.example", false);
+    setUpBillingEventForExistingDomain();
+    doSuccessfulTest(
+        "domain_info_fee_premium_response.xml",
+        false,
+        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew"),
+        true);
+  }
+
+  @Test
+  void testFeeExtension_renewCommandPremium_anchorTenant() throws Exception {
+    createTld("tld");
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setPremiumList(persistPremiumList("tld", USD, "example,USD 70"))
+            .build());
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "1"));
+    persistTestEntities("example.tld", false);
+    setUpBillingEventForExistingDomain(NONPREMIUM, null);
+    doSuccessfulTest(
+        "domain_info_fee_response.xml",
+        false,
+        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew", "FEE", "11.00", "PERIOD", "1"),
+        true);
+  }
+
+  @Test
+  void testFeeExtension_renewCommandPremium_internalRegistration() throws Exception {
+    createTld("tld");
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setPremiumList(persistPremiumList("tld", USD, "example,USD 70"))
+            .build());
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "1"));
+    persistTestEntities("example.tld", false);
+    setUpBillingEventForExistingDomain(SPECIFIED, Money.of(USD, 3));
+    doSuccessfulTest(
+        "domain_info_fee_response.xml",
+        false,
+        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew", "FEE", "3.00", "PERIOD", "1"),
+        true);
+  }
+
+  @Test
+  void testFeeExtension_renewCommandPremium_anchorTenant_multiYear() throws Exception {
+    createTld("tld");
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setPremiumList(persistPremiumList("tld", USD, "example,USD 70"))
+            .build());
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "3"));
+    persistTestEntities("example.tld", false);
+    setUpBillingEventForExistingDomain(NONPREMIUM, null);
+    doSuccessfulTest(
+        "domain_info_fee_response.xml",
+        false,
+        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew", "FEE", "33.00", "PERIOD", "3"),
+        true);
+  }
+
+  @Test
+  void testFeeExtension_renewCommandPremium_internalRegistration_multiYear() throws Exception {
+    createTld("tld");
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setPremiumList(persistPremiumList("tld", USD, "example,USD 70"))
+            .build());
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "3"));
+    persistTestEntities("example.tld", false);
+    setUpBillingEventForExistingDomain(SPECIFIED, Money.of(USD, 3));
+    doSuccessfulTest(
+        "domain_info_fee_response.xml",
+        false,
+        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew", "FEE", "9.00", "PERIOD", "3"),
+        true);
+  }
+
+  @Test
+  void testFeeExtension_renewCommandStandard_internalRegistration() throws Exception {
+    createTld("tld");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "renew", "PERIOD", "1"));
+    persistTestEntities("example.tld", false);
+    setUpBillingEventForExistingDomain(SPECIFIED, Money.of(USD, 3));
+    doSuccessfulTest(
+        "domain_info_fee_response.xml",
+        false,
+        ImmutableMap.of("COMMAND", "renew", "DESCRIPTION", "renew", "FEE", "3.00", "PERIOD", "1"),
+        true);
+  }
+
+  /** Test transfer command on a premium label. */
+  @Test
+  void testFeeExtension_transferCommandPremium() throws Exception {
+    createTld("example");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "transfer", "PERIOD", "1"));
+    persistTestEntities("rich.example", false);
+    setUpBillingEventForExistingDomain();
+    doSuccessfulTest(
+        "domain_info_fee_premium_response.xml",
+        false,
+        ImmutableMap.of("COMMAND", "transfer", "DESCRIPTION", "renew"),
+        true);
+  }
+
+  /** Test restore command on a premium label. */
+  @Test
+  void testFeeExtension_restoreCommandPremium() throws Exception {
+    createTld("example");
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE, "NAME", "rich.example", "COMMAND", "restore", "PERIOD", "1"));
+    persistTestEntities("rich.example", false);
+    setUpBillingEventForExistingDomain();
+    doSuccessfulTest(
+        "domain_info_fee_restore_premium_response.xml", false, ImmutableMap.of(), true);
+  }
+
+  /** Test setting the currency explicitly to a wrong value. */
+  @Test
+  void testFeeExtension_wrongCurrency() {
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE, "COMMAND", "create", "CURRENCY", "EUR", "PERIOD", "1"));
+    persistTestEntities(false);
+    setUpBillingEventForExistingDomain();
+    EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  /** Test requesting a period that isn't in years. */
+  @Test
+  void testFeeExtension_periodNotInYears() {
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "create", "PERIOD", "2", "UNIT", "m"));
+    persistTestEntities(false);
+    setUpBillingEventForExistingDomain();
+    EppException thrown = assertThrows(BadPeriodUnitException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  /** Test a command that specifies a phase. */
+  @Test
+  void testFeeExtension_commandPhase() {
+    setEppInput("domain_info_fee_command_phase.xml");
+    persistTestEntities(false);
+    setUpBillingEventForExistingDomain();
+    EppException thrown = assertThrows(FeeChecksDontSupportPhasesException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  /** Test a command that specifies a subphase. */
+  @Test
+  void testFeeExtension_commandSubphase() {
+    setEppInput("domain_info_fee_command_subphase.xml");
+    persistTestEntities(false);
+    setUpBillingEventForExistingDomain();
+    EppException thrown = assertThrows(FeeChecksDontSupportPhasesException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  /** Test a restore for more than one year. */
+  @Test
+  void testFeeExtension_multiyearRestore() {
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "restore", "PERIOD", "2"));
+    persistTestEntities(false);
+    setUpBillingEventForExistingDomain();
+    EppException thrown = assertThrows(RestoresAreAlwaysForOneYearException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  /** Test a transfer for more than one year. */
+  @Test
+  void testFeeExtension_multiyearTransfer() {
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(SUBSTITUTION_BASE, "COMMAND", "transfer", "PERIOD", "2"));
+    persistTestEntities(false);
+    setUpBillingEventForExistingDomain();
+    EppException thrown = assertThrows(TransfersAreAlwaysForOneYearException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFeeExtension_unknownCurrency() {
+    setEppInput(
+        "domain_info_fee.xml",
+        updateSubstitutions(
+            SUBSTITUTION_BASE, "COMMAND", "create", "CURRENCY", "BAD", "PERIOD", "1"));
+    EppException thrown = assertThrows(UnknownCurrencyEppException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
 }

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

@@ -1,827 +0,0 @@
-// 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.domain;
-
-import static com.google.common.truth.Truth.assertThat;
-import static google.registry.model.billing.BillingBase.RenewalPriceBehavior.DEFAULT;
-import static google.registry.model.billing.BillingBase.RenewalPriceBehavior.NONPREMIUM;
-import static google.registry.model.billing.BillingBase.RenewalPriceBehavior.SPECIFIED;
-import static google.registry.model.domain.token.AllocationToken.TokenType.DEFAULT_PROMO;
-import static google.registry.testing.DatabaseHelper.assertBillingEvents;
-import static google.registry.testing.DatabaseHelper.assertPollMessages;
-import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.getOnlyHistoryEntryOfType;
-import static google.registry.testing.DatabaseHelper.loadByKey;
-import static google.registry.testing.DatabaseHelper.loadRegistrar;
-import static google.registry.testing.DatabaseHelper.persistPremiumList;
-import static google.registry.testing.DatabaseHelper.persistResource;
-import static google.registry.testing.DatabaseHelper.persistResources;
-import static google.registry.testing.DomainSubject.assertAboutDomains;
-import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions;
-import static google.registry.testing.HistoryEntrySubject.assertAboutHistoryEntries;
-import static google.registry.testing.TestDataHelper.updateSubstitutions;
-import static google.registry.util.DateTimeUtils.END_OF_TIME;
-import static google.registry.util.DateTimeUtils.START_OF_TIME;
-import static org.joda.money.CurrencyUnit.EUR;
-import static org.joda.money.CurrencyUnit.USD;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.collect.Iterables;
-import google.registry.flows.EppException;
-import google.registry.flows.domain.DomainFlowUtils.CurrencyUnitMismatchException;
-import google.registry.flows.domain.DomainFlowUtils.CurrencyValueScaleException;
-import google.registry.flows.domain.DomainFlowUtils.FeesMismatchException;
-import google.registry.flows.domain.DomainFlowUtils.UnsupportedFeeAttributeException;
-import google.registry.model.billing.BillingBase.Flag;
-import google.registry.model.billing.BillingBase.Reason;
-import google.registry.model.billing.BillingBase.RenewalPriceBehavior;
-import google.registry.model.billing.BillingEvent;
-import google.registry.model.billing.BillingRecurrence;
-import google.registry.model.domain.Domain;
-import google.registry.model.domain.DomainHistory;
-import google.registry.model.domain.GracePeriod;
-import google.registry.model.domain.rgp.GracePeriodStatus;
-import google.registry.model.domain.token.AllocationToken;
-import google.registry.model.eppcommon.StatusValue;
-import google.registry.model.poll.PollMessage;
-import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.tld.Tld;
-import google.registry.testing.DatabaseHelper;
-import java.util.Map;
-import javax.annotation.Nullable;
-import org.joda.money.Money;
-import org.joda.time.DateTime;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/** Tests for {@link DomainRenewFlow} that use the old fee extensions (0.6, 0.11, 0.12). */
-public class DomainRenewFlowOldFeeExtensionsTest
-    extends ProductionSimulatingFeeExtensionsTest<DomainRenewFlow> {
-
-  private static final ImmutableMap<String, String> FEE_BASE_MAP =
-      ImmutableMap.of(
-          "NAME", "example.tld",
-          "PERIOD", "5",
-          "EX_DATE", "2005-04-03T22:00:00.0Z",
-          "FEE", "55.00",
-          "CURRENCY", "USD");
-
-  private static final ImmutableMap<String, String> FEE_06_MAP =
-      updateSubstitutions(FEE_BASE_MAP, "FEE_VERSION", "fee-0.6", "FEE_NS", "fee");
-  private static final ImmutableMap<String, String> FEE_11_MAP =
-      updateSubstitutions(FEE_BASE_MAP, "FEE_VERSION", "fee-0.11", "FEE_NS", "fee11");
-  private static final ImmutableMap<String, String> FEE_12_MAP =
-      updateSubstitutions(FEE_BASE_MAP, "FEE_VERSION", "fee-0.12", "FEE_NS", "fee12");
-
-  private final DateTime expirationTime = DateTime.parse("2000-04-03T22:00:00.0Z");
-
-  @BeforeEach
-  void beforeEachDomainRenewFlowOldFeeExtensionsTest() {
-    clock.setTo(expirationTime.minusMillis(20));
-    createTld("tld");
-    persistResource(
-        loadRegistrar("TheRegistrar")
-            .asBuilder()
-            .setBillingAccountMap(ImmutableMap.of(USD, "123", EUR, "567"))
-            .build());
-    setEppInput("domain_renew.xml", ImmutableMap.of("DOMAIN", "example.tld", "YEARS", "5"));
-  }
-
-  private void persistDomain(StatusValue... statusValues) throws Exception {
-    persistDomain(DEFAULT, null, statusValues);
-  }
-
-  private void persistDomain(
-      RenewalPriceBehavior renewalPriceBehavior,
-      @Nullable Money renewalPrice,
-      StatusValue... statusValues)
-      throws Exception {
-    Domain domain = DatabaseHelper.newDomain(getUniqueIdFromCommand());
-    try {
-      DomainHistory historyEntryDomainCreate =
-          new DomainHistory.Builder()
-              .setDomain(domain)
-              .setType(HistoryEntry.Type.DOMAIN_CREATE)
-              .setModificationTime(clock.nowUtc())
-              .setRegistrarId(domain.getCreationRegistrarId())
-              .build();
-      BillingRecurrence autorenewEvent =
-          new BillingRecurrence.Builder()
-              .setReason(Reason.RENEW)
-              .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
-              .setTargetId(getUniqueIdFromCommand())
-              .setRegistrarId("TheRegistrar")
-              .setEventTime(expirationTime)
-              .setRecurrenceEndTime(END_OF_TIME)
-              .setDomainHistory(historyEntryDomainCreate)
-              .setRenewalPriceBehavior(renewalPriceBehavior)
-              .setRenewalPrice(renewalPrice)
-              .build();
-      PollMessage.Autorenew autorenewPollMessage =
-          new PollMessage.Autorenew.Builder()
-              .setTargetId(getUniqueIdFromCommand())
-              .setRegistrarId("TheRegistrar")
-              .setEventTime(expirationTime)
-              .setAutorenewEndTime(END_OF_TIME)
-              .setMsg("Domain was auto-renewed.")
-              .setHistoryEntry(historyEntryDomainCreate)
-              .build();
-      Domain newDomain =
-          domain
-              .asBuilder()
-              .setRegistrationExpirationTime(expirationTime)
-              .setStatusValues(ImmutableSet.copyOf(statusValues))
-              .setAutorenewBillingEvent(autorenewEvent.createVKey())
-              .setAutorenewPollMessage(autorenewPollMessage.createVKey())
-              .build();
-      persistResources(
-          ImmutableSet.of(
-              historyEntryDomainCreate, autorenewEvent,
-              autorenewPollMessage, newDomain));
-    } catch (Exception e) {
-      throw new RuntimeException("Error persisting domain", e);
-    }
-    clock.advanceOneMilli();
-  }
-
-  @Test
-  void testFailure_wrongFeeAmount_v06() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_06_MAP);
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
-            .build());
-    persistDomain();
-    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_wrongFeeAmount_v11() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_11_MAP);
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
-            .build());
-    persistDomain();
-    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_wrongFeeAmount_v12() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_12_MAP);
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
-            .build());
-    persistDomain();
-    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_wrongCurrency_v06() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_06_MAP);
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setCurrency(EUR)
-            .setCreateBillingCostTransitions(
-                ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 13)))
-            .setRestoreBillingCost(Money.of(EUR, 11))
-            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 7)))
-            .setEapFeeSchedule(ImmutableSortedMap.of(START_OF_TIME, Money.zero(EUR)))
-            .setRegistryLockOrUnlockBillingCost(Money.of(EUR, 20))
-            .setServerStatusChangeBillingCost(Money.of(EUR, 19))
-            .build());
-    persistDomain();
-    EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_wrongCurrency_v11() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_11_MAP);
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setCurrency(EUR)
-            .setCreateBillingCostTransitions(
-                ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 13)))
-            .setRestoreBillingCost(Money.of(EUR, 11))
-            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 7)))
-            .setEapFeeSchedule(ImmutableSortedMap.of(START_OF_TIME, Money.zero(EUR)))
-            .setRegistryLockOrUnlockBillingCost(Money.of(EUR, 20))
-            .setServerStatusChangeBillingCost(Money.of(EUR, 19))
-            .build());
-    persistDomain();
-    EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_wrongCurrency_v12() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_12_MAP);
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setCurrency(EUR)
-            .setCreateBillingCostTransitions(
-                ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 13)))
-            .setRestoreBillingCost(Money.of(EUR, 11))
-            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 7)))
-            .setEapFeeSchedule(ImmutableSortedMap.of(START_OF_TIME, Money.zero(EUR)))
-            .setRegistryLockOrUnlockBillingCost(Money.of(EUR, 20))
-            .setServerStatusChangeBillingCost(Money.of(EUR, 19))
-            .build());
-    persistDomain();
-    EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_feeGivenInWrongScale_v06() throws Exception {
-    setEppInput("domain_renew_fee_bad_scale.xml", FEE_06_MAP);
-    persistDomain();
-    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_feeGivenInWrongScale_v11() throws Exception {
-    setEppInput("domain_renew_fee_bad_scale.xml", FEE_11_MAP);
-    persistDomain();
-    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_feeGivenInWrongScale_v12() throws Exception {
-    setEppInput("domain_renew_fee_bad_scale.xml", FEE_12_MAP);
-    persistDomain();
-    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testSuccess_doesNotApplyNonPremiumDefaultTokenToPremiumName_v06() throws Exception {
-    ImmutableMap<String, String> customFeeMap = updateSubstitutions(FEE_06_MAP, "FEE", "500");
-    setEppInput("domain_renew_fee.xml", customFeeMap);
-    persistDomain();
-    AllocationToken defaultToken1 =
-        persistResource(
-            new AllocationToken.Builder()
-                .setToken("aaaaa")
-                .setTokenType(DEFAULT_PROMO)
-                .setDiscountFraction(0.5)
-                .setDiscountYears(1)
-                .setAllowedTlds(ImmutableSet.of("tld"))
-                .build());
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
-            .setPremiumList(persistPremiumList("tld", USD, "example,USD 100"))
-            .build());
-    runFlowAssertResponse(
-        loadFile(
-            "domain_renew_response_fee.xml",
-            ImmutableMap.of(
-                "NAME",
-                "example.tld",
-                "PERIOD",
-                "5",
-                "EX_DATE",
-                "2005-04-03T22:00:00.0Z",
-                "FEE",
-                "500.00",
-                "CURRENCY",
-                "USD",
-                "FEE_VERSION",
-                "fee-0.6",
-                "FEE_NS",
-                "fee")));
-    BillingEvent billingEvent =
-        Iterables.getOnlyElement(DatabaseHelper.loadAllOf(BillingEvent.class));
-    assertThat(billingEvent.getTargetId()).isEqualTo("example.tld");
-    assertThat(billingEvent.getAllocationToken()).isEmpty();
-  }
-
-  @Test
-  void testSuccess_internalRegiration_premiumDomain_v06() throws Exception {
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setPremiumList(persistPremiumList("tld", USD, "example,USD 100"))
-            .build());
-    persistDomain(SPECIFIED, Money.of(USD, 2));
-    setRegistrarIdForFlow("NewRegistrar");
-    ImmutableMap<String, String> customFeeMap = updateSubstitutions(FEE_06_MAP, "FEE", "10.00");
-    setEppInput("domain_renew_fee.xml", customFeeMap);
-    doSuccessfulTest(
-        "domain_renew_response_fee.xml",
-        5,
-        "NewRegistrar",
-        UserPrivileges.SUPERUSER,
-        customFeeMap,
-        Money.of(USD, 10),
-        SPECIFIED,
-        Money.of(USD, 2));
-  }
-
-  @Test
-  void testSuccess_wrongFeeAmountTooHigh_defaultToken_v06() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_06_MAP);
-    persistDomain();
-    AllocationToken defaultToken1 =
-        persistResource(
-            new AllocationToken.Builder()
-                .setToken("aaaaa")
-                .setTokenType(DEFAULT_PROMO)
-                .setDiscountFraction(0.5)
-                .setDiscountYears(1)
-                .setAllowedTlds(ImmutableSet.of("tld"))
-                .build());
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
-            .build());
-    runFlowAssertResponse(
-        loadFile(
-            "domain_renew_response_fee.xml",
-            ImmutableMap.of(
-                "NAME",
-                "example.tld",
-                "PERIOD",
-                "5",
-                "EX_DATE",
-                "2005-04-03T22:00:00.0Z",
-                "FEE",
-                "49.50",
-                "CURRENCY",
-                "USD",
-                "FEE_VERSION",
-                "fee-0.6",
-                "FEE_NS",
-                "fee")));
-  }
-
-  @Test
-  void testFailure_wrongFeeAmountTooLow_defaultToken_v06() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_06_MAP);
-    persistDomain();
-    AllocationToken defaultToken1 =
-        persistResource(
-            new AllocationToken.Builder()
-                .setToken("aaaaa")
-                .setTokenType(DEFAULT_PROMO)
-                .setDiscountFraction(0.5)
-                .setDiscountYears(1)
-                .setAllowedTlds(ImmutableSet.of("tld"))
-                .build());
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
-            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
-            .build());
-    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testSuccess_wrongFeeAmountTooHigh_defaultToken_v11() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_11_MAP);
-    persistDomain();
-    AllocationToken defaultToken1 =
-        persistResource(
-            new AllocationToken.Builder()
-                .setToken("aaaaa")
-                .setTokenType(DEFAULT_PROMO)
-                .setDiscountFraction(0.5)
-                .setDiscountYears(1)
-                .setAllowedTlds(ImmutableSet.of("tld"))
-                .build());
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
-            .build());
-    runFlowAssertResponse(
-        loadFile(
-            "domain_renew_response_fee.xml",
-            ImmutableMap.of(
-                "NAME",
-                "example.tld",
-                "PERIOD",
-                "5",
-                "EX_DATE",
-                "2005-04-03T22:00:00.0Z",
-                "FEE",
-                "49.50",
-                "CURRENCY",
-                "USD",
-                "FEE_VERSION",
-                "fee-0.11",
-                "FEE_NS",
-                "fee")));
-  }
-
-  @Test
-  void testFailure_wrongFeeAmountTooLow_defaultToken_v11() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_11_MAP);
-    persistDomain();
-    AllocationToken defaultToken1 =
-        persistResource(
-            new AllocationToken.Builder()
-                .setToken("aaaaa")
-                .setTokenType(DEFAULT_PROMO)
-                .setDiscountFraction(0.5)
-                .setDiscountYears(1)
-                .setAllowedTlds(ImmutableSet.of("tld"))
-                .build());
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
-            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
-            .build());
-    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testSuccess_wrongFeeAmountTooHigh_defaultToken_v12() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_12_MAP);
-    persistDomain();
-    AllocationToken defaultToken1 =
-        persistResource(
-            new AllocationToken.Builder()
-                .setToken("aaaaa")
-                .setTokenType(DEFAULT_PROMO)
-                .setDiscountFraction(0.5)
-                .setDiscountYears(1)
-                .setAllowedTlds(ImmutableSet.of("tld"))
-                .build());
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
-            .build());
-    runFlowAssertResponse(
-        loadFile(
-            "domain_renew_response_fee.xml",
-            ImmutableMap.of(
-                "NAME",
-                "example.tld",
-                "PERIOD",
-                "5",
-                "EX_DATE",
-                "2005-04-03T22:00:00.0Z",
-                "FEE",
-                "49.50",
-                "CURRENCY",
-                "USD",
-                "FEE_VERSION",
-                "fee-0.12",
-                "FEE_NS",
-                "fee")));
-  }
-
-  @Test
-  void testFailure_wrongFeeAmountTooLow_defaultToken_v12() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_06_MAP);
-    persistDomain();
-    AllocationToken defaultToken1 =
-        persistResource(
-            new AllocationToken.Builder()
-                .setToken("aaaaa")
-                .setTokenType(DEFAULT_PROMO)
-                .setDiscountFraction(0.5)
-                .setDiscountYears(1)
-                .setAllowedTlds(ImmutableSet.of("tld"))
-                .build());
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
-            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
-            .build());
-    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_refundableFee_v06() throws Exception {
-    setEppInput("domain_renew_fee_refundable.xml", FEE_06_MAP);
-    persistDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_refundableFee_v11() throws Exception {
-    setEppInput("domain_renew_fee_refundable.xml", FEE_11_MAP);
-    persistDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_refundableFee_v12() throws Exception {
-    setEppInput("domain_renew_fee_refundable.xml", FEE_12_MAP);
-    persistDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_gracePeriodFee_v06() throws Exception {
-    setEppInput("domain_renew_fee_grace_period.xml", FEE_06_MAP);
-    persistDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_gracePeriodFee_v11() throws Exception {
-    setEppInput("domain_renew_fee_grace_period.xml", FEE_11_MAP);
-    persistDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_gracePeriodFee_v12() throws Exception {
-    setEppInput("domain_renew_fee_grace_period.xml", FEE_12_MAP);
-    persistDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_appliedFee_v06() throws Exception {
-    setEppInput("domain_renew_fee_applied.xml", FEE_06_MAP);
-    persistDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_appliedFee_v11() throws Exception {
-    setEppInput("domain_renew_fee_applied.xml", FEE_11_MAP);
-    persistDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_appliedFee_v12() throws Exception {
-    setEppInput("domain_renew_fee_applied.xml", FEE_12_MAP);
-    persistDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testSuccess_fee_v06() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_06_MAP);
-    persistDomain();
-    doSuccessfulTest("domain_renew_response_fee.xml", 5, FEE_06_MAP);
-  }
-
-  @Test
-  void testSuccess_fee_v11() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_11_MAP);
-    persistDomain();
-    doSuccessfulTest("domain_renew_response_fee.xml", 5, FEE_11_MAP);
-  }
-
-  @Test
-  void testSuccess_fee_v12() throws Exception {
-    setEppInput("domain_renew_fee.xml", FEE_12_MAP);
-    persistDomain();
-    doSuccessfulTest("domain_renew_response_fee.xml", 5, FEE_12_MAP);
-  }
-
-  @Test
-  void testSuccess_fee_withDefaultAttributes_v06() throws Exception {
-    setEppInput("domain_renew_fee_defaults.xml", FEE_06_MAP);
-    persistDomain();
-    doSuccessfulTest("domain_renew_response_fee.xml", 5, FEE_06_MAP);
-  }
-
-  @Test
-  void testSuccess_fee_withDefaultAttributes_v11() throws Exception {
-    setEppInput("domain_renew_fee_defaults.xml", FEE_11_MAP);
-    persistDomain();
-    doSuccessfulTest("domain_renew_response_fee.xml", 5, FEE_11_MAP);
-  }
-
-  @Test
-  void testSuccess_fee_withDefaultAttributes_v12() throws Exception {
-    setEppInput("domain_renew_fee_defaults.xml", FEE_12_MAP);
-    persistDomain();
-    doSuccessfulTest("domain_renew_response_fee.xml", 5, FEE_12_MAP);
-  }
-
-  @Test
-  void testSuccess_anchorTenant_premiumDomain_v06() throws Exception {
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setPremiumList(persistPremiumList("tld", USD, "example,USD 100"))
-            .build());
-    persistDomain(NONPREMIUM, null);
-    setRegistrarIdForFlow("NewRegistrar");
-    ImmutableMap<String, String> customFeeMap = updateSubstitutions(FEE_06_MAP, "FEE", "55.00");
-    setEppInput("domain_renew_fee.xml", customFeeMap);
-    doSuccessfulTest(
-        "domain_renew_response_fee.xml",
-        5,
-        "NewRegistrar",
-        UserPrivileges.SUPERUSER,
-        customFeeMap,
-        Money.of(USD, 55),
-        NONPREMIUM,
-        null);
-  }
-
-  @Test
-  void testSuccess_customLogicFee_v06() throws Exception {
-    // The "costly-renew" domain has an additional RENEW fee of 100 from custom logic on top of the
-    // normal $11 standard renew price for this TLD.
-    ImmutableMap<String, String> customFeeMap =
-        updateSubstitutions(
-            FEE_06_MAP,
-            "NAME",
-            "costly-renew.tld",
-            "PERIOD",
-            "1",
-            "EX_DATE",
-            "2001-04-03T22:00:00.0Z",
-            "FEE",
-            "111.00");
-    setEppInput("domain_renew_fee.xml", customFeeMap);
-    persistDomain();
-    doSuccessfulTest(
-        "domain_renew_response_fee.xml",
-        1,
-        "TheRegistrar",
-        UserPrivileges.NORMAL,
-        customFeeMap,
-        Money.of(USD, 111));
-  }
-
-  private void doSuccessfulTest(String responseFilename, int renewalYears) throws Exception {
-    doSuccessfulTest(responseFilename, renewalYears, ImmutableMap.of());
-  }
-
-  private void doSuccessfulTest(
-      String responseFilename, int renewalYears, Map<String, String> substitutions)
-      throws Exception {
-    doSuccessfulTest(
-        responseFilename,
-        renewalYears,
-        "TheRegistrar",
-        UserPrivileges.NORMAL,
-        substitutions,
-        Money.of(USD, 11).multipliedBy(renewalYears),
-        DEFAULT,
-        null);
-  }
-
-  private void doSuccessfulTest(
-      String responseFilename,
-      int renewalYears,
-      String renewalClientId,
-      UserPrivileges userPrivileges,
-      Map<String, String> substitutions,
-      Money totalRenewCost)
-      throws Exception {
-    doSuccessfulTest(
-        responseFilename,
-        renewalYears,
-        renewalClientId,
-        userPrivileges,
-        substitutions,
-        totalRenewCost,
-        DEFAULT,
-        null);
-  }
-
-  private void doSuccessfulTest(
-      String responseFilename,
-      int renewalYears,
-      String renewalClientId,
-      UserPrivileges userPrivileges,
-      Map<String, String> substitutions,
-      Money totalRenewCost,
-      RenewalPriceBehavior renewalPriceBehavior,
-      @Nullable Money renewalPrice)
-      throws Exception {
-    assertMutatingFlow(true);
-    DateTime currentExpiration = reloadResourceByForeignKey().getRegistrationExpirationTime();
-    DateTime newExpiration = currentExpiration.plusYears(renewalYears);
-    runFlowAssertResponse(
-        CommitMode.LIVE, userPrivileges, loadFile(responseFilename, substitutions));
-    Domain domain = reloadResourceByForeignKey();
-    assertLastHistoryContainsResource(domain);
-    DomainHistory historyEntryDomainRenew =
-        getOnlyHistoryEntryOfType(domain, HistoryEntry.Type.DOMAIN_RENEW, DomainHistory.class);
-    assertThat(loadByKey(domain.getAutorenewBillingEvent()).getEventTime())
-        .isEqualTo(newExpiration);
-    assertAboutDomains()
-        .that(domain)
-        .isActiveAt(clock.nowUtc())
-        .and()
-        .hasRegistrationExpirationTime(newExpiration)
-        .and()
-        .hasOneHistoryEntryEachOfTypes(
-            HistoryEntry.Type.DOMAIN_CREATE, HistoryEntry.Type.DOMAIN_RENEW)
-        .and()
-        .hasLastEppUpdateTime(clock.nowUtc())
-        .and()
-        .hasLastEppUpdateRegistrarId(renewalClientId);
-    assertAboutHistoryEntries().that(historyEntryDomainRenew).hasPeriodYears(renewalYears);
-    BillingEvent renewBillingEvent =
-        new BillingEvent.Builder()
-            .setReason(Reason.RENEW)
-            .setTargetId(getUniqueIdFromCommand())
-            .setRegistrarId(renewalClientId)
-            .setCost(totalRenewCost)
-            .setPeriodYears(renewalYears)
-            .setEventTime(clock.nowUtc())
-            .setBillingTime(clock.nowUtc().plus(Tld.get("tld").getRenewGracePeriodLength()))
-            .setDomainHistory(historyEntryDomainRenew)
-            .build();
-    assertBillingEvents(
-        renewBillingEvent,
-        new BillingRecurrence.Builder()
-            .setReason(Reason.RENEW)
-            .setRenewalPriceBehavior(renewalPriceBehavior)
-            .setRenewalPrice(renewalPrice)
-            .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
-            .setTargetId(getUniqueIdFromCommand())
-            .setRegistrarId("TheRegistrar")
-            .setEventTime(expirationTime)
-            .setRecurrenceEndTime(clock.nowUtc())
-            .setDomainHistory(
-                getOnlyHistoryEntryOfType(
-                    domain, HistoryEntry.Type.DOMAIN_CREATE, DomainHistory.class))
-            .build(),
-        new BillingRecurrence.Builder()
-            .setReason(Reason.RENEW)
-            .setRenewalPriceBehavior(renewalPriceBehavior)
-            .setRenewalPrice(renewalPrice)
-            .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
-            .setTargetId(getUniqueIdFromCommand())
-            .setRegistrarId("TheRegistrar")
-            .setEventTime(domain.getRegistrationExpirationTime())
-            .setRecurrenceEndTime(END_OF_TIME)
-            .setDomainHistory(historyEntryDomainRenew)
-            .build());
-    // There should only be the new autorenew poll message, as the old one will have been deleted
-    // since it had no messages left to deliver.
-    assertPollMessages(
-        new PollMessage.Autorenew.Builder()
-            .setTargetId(getUniqueIdFromCommand())
-            .setRegistrarId("TheRegistrar")
-            .setEventTime(domain.getRegistrationExpirationTime())
-            .setAutorenewEndTime(END_OF_TIME)
-            .setMsg("Domain was auto-renewed.")
-            .setHistoryEntry(historyEntryDomainRenew)
-            .build());
-    assertGracePeriods(
-        domain.getGracePeriods(),
-        ImmutableMap.of(
-            GracePeriod.create(
-                GracePeriodStatus.RENEW,
-                domain.getRepoId(),
-                clock.nowUtc().plus(Tld.get("tld").getRenewGracePeriodLength()),
-                renewalClientId,
-                null),
-            renewBillingEvent));
-  }
-}

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

@@ -119,6 +119,12 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, Domain>
           "FEE", "55.00",
           "CURRENCY", "USD");
 
+  private static final ImmutableMap<String, String> FEE_06_MAP =
+      updateSubstitutions(FEE_BASE_MAP, "FEE_VERSION", "fee-0.6", "FEE_NS", "fee");
+  private static final ImmutableMap<String, String> FEE_11_MAP =
+      updateSubstitutions(FEE_BASE_MAP, "FEE_VERSION", "fee-0.11", "FEE_NS", "fee11");
+  private static final ImmutableMap<String, String> FEE_12_MAP =
+      updateSubstitutions(FEE_BASE_MAP, "FEE_VERSION", "fee-0.12", "FEE_NS", "fee12");
   private static final ImmutableMap<String, String> FEE_STD_1_0_MAP =
       updateSubstitutions(FEE_BASE_MAP, "FEE_VERSION", "epp:fee-1.0", "FEE_NS", "fee1_00");
 
@@ -1561,4 +1567,538 @@ class DomainRenewFlowTest extends ResourceFlowTestCase<DomainRenewFlow, Domain>
     EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
   }
+
+  @Test
+  void testFailure_wrongFeeAmount_v06() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_06_MAP);
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
+            .build());
+    persistDomain();
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongFeeAmount_v11() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_11_MAP);
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
+            .build());
+    persistDomain();
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongFeeAmount_v12() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_12_MAP);
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
+            .build());
+    persistDomain();
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongCurrency_v06() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_06_MAP);
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setCurrency(EUR)
+            .setCreateBillingCostTransitions(
+                ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 13)))
+            .setRestoreBillingCost(Money.of(EUR, 11))
+            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 7)))
+            .setEapFeeSchedule(ImmutableSortedMap.of(START_OF_TIME, Money.zero(EUR)))
+            .setRegistryLockOrUnlockBillingCost(Money.of(EUR, 20))
+            .setServerStatusChangeBillingCost(Money.of(EUR, 19))
+            .build());
+    persistDomain();
+    EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongCurrency_v11() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_11_MAP);
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setCurrency(EUR)
+            .setCreateBillingCostTransitions(
+                ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 13)))
+            .setRestoreBillingCost(Money.of(EUR, 11))
+            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 7)))
+            .setEapFeeSchedule(ImmutableSortedMap.of(START_OF_TIME, Money.zero(EUR)))
+            .setRegistryLockOrUnlockBillingCost(Money.of(EUR, 20))
+            .setServerStatusChangeBillingCost(Money.of(EUR, 19))
+            .build());
+    persistDomain();
+    EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongCurrency_v12() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_12_MAP);
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setCurrency(EUR)
+            .setCreateBillingCostTransitions(
+                ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 13)))
+            .setRestoreBillingCost(Money.of(EUR, 11))
+            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 7)))
+            .setEapFeeSchedule(ImmutableSortedMap.of(START_OF_TIME, Money.zero(EUR)))
+            .setRegistryLockOrUnlockBillingCost(Money.of(EUR, 20))
+            .setServerStatusChangeBillingCost(Money.of(EUR, 19))
+            .build());
+    persistDomain();
+    EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_feeGivenInWrongScale_v06() throws Exception {
+    setEppInput("domain_renew_fee_bad_scale.xml", FEE_06_MAP);
+    persistDomain();
+    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_feeGivenInWrongScale_v11() throws Exception {
+    setEppInput("domain_renew_fee_bad_scale.xml", FEE_11_MAP);
+    persistDomain();
+    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_feeGivenInWrongScale_v12() throws Exception {
+    setEppInput("domain_renew_fee_bad_scale.xml", FEE_12_MAP);
+    persistDomain();
+    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_doesNotApplyNonPremiumDefaultTokenToPremiumName_v06() throws Exception {
+    ImmutableMap<String, String> customFeeMap = updateSubstitutions(FEE_06_MAP, "FEE", "500");
+    setEppInput("domain_renew_fee.xml", customFeeMap);
+    persistDomain();
+    AllocationToken defaultToken1 =
+        persistResource(
+            new AllocationToken.Builder()
+                .setToken("aaaaa")
+                .setTokenType(DEFAULT_PROMO)
+                .setDiscountFraction(0.5)
+                .setDiscountYears(1)
+                .setAllowedTlds(ImmutableSet.of("tld"))
+                .build());
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
+            .setPremiumList(persistPremiumList("tld", USD, "example,USD 100"))
+            .build());
+    runFlowAssertResponse(
+        loadFile(
+            "domain_renew_response_fee.xml",
+            ImmutableMap.of(
+                "NAME",
+                "example.tld",
+                "PERIOD",
+                "5",
+                "EX_DATE",
+                "2005-04-03T22:00:00.0Z",
+                "FEE",
+                "500.00",
+                "CURRENCY",
+                "USD",
+                "FEE_VERSION",
+                "fee-0.6",
+                "FEE_NS",
+                "fee")));
+    BillingEvent billingEvent =
+        Iterables.getOnlyElement(DatabaseHelper.loadAllOf(BillingEvent.class));
+    assertThat(billingEvent.getTargetId()).isEqualTo("example.tld");
+    assertThat(billingEvent.getAllocationToken()).isEmpty();
+  }
+
+  @Test
+  void testSuccess_internalRegiration_premiumDomain_v06() throws Exception {
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setPremiumList(persistPremiumList("tld", USD, "example,USD 100"))
+            .build());
+    persistDomain(SPECIFIED, Money.of(USD, 2));
+    setRegistrarIdForFlow("NewRegistrar");
+    ImmutableMap<String, String> customFeeMap = updateSubstitutions(FEE_06_MAP, "FEE", "10.00");
+    setEppInput("domain_renew_fee.xml", customFeeMap);
+    doSuccessfulTest(
+        "domain_renew_response_fee.xml",
+        5,
+        "NewRegistrar",
+        UserPrivileges.SUPERUSER,
+        customFeeMap,
+        Money.of(USD, 10),
+        SPECIFIED,
+        Money.of(USD, 2));
+  }
+
+  @Test
+  void testSuccess_wrongFeeAmountTooHigh_defaultToken_v06() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_06_MAP);
+    persistDomain();
+    AllocationToken defaultToken1 =
+        persistResource(
+            new AllocationToken.Builder()
+                .setToken("aaaaa")
+                .setTokenType(DEFAULT_PROMO)
+                .setDiscountFraction(0.5)
+                .setDiscountYears(1)
+                .setAllowedTlds(ImmutableSet.of("tld"))
+                .build());
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
+            .build());
+    runFlowAssertResponse(
+        loadFile(
+            "domain_renew_response_fee.xml",
+            ImmutableMap.of(
+                "NAME",
+                "example.tld",
+                "PERIOD",
+                "5",
+                "EX_DATE",
+                "2005-04-03T22:00:00.0Z",
+                "FEE",
+                "49.50",
+                "CURRENCY",
+                "USD",
+                "FEE_VERSION",
+                "fee-0.6",
+                "FEE_NS",
+                "fee")));
+  }
+
+  @Test
+  void testFailure_wrongFeeAmountTooLow_defaultToken_v06() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_06_MAP);
+    persistDomain();
+    AllocationToken defaultToken1 =
+        persistResource(
+            new AllocationToken.Builder()
+                .setToken("aaaaa")
+                .setTokenType(DEFAULT_PROMO)
+                .setDiscountFraction(0.5)
+                .setDiscountYears(1)
+                .setAllowedTlds(ImmutableSet.of("tld"))
+                .build());
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
+            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
+            .build());
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_wrongFeeAmountTooHigh_defaultToken_v11() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_11_MAP);
+    persistDomain();
+    AllocationToken defaultToken1 =
+        persistResource(
+            new AllocationToken.Builder()
+                .setToken("aaaaa")
+                .setTokenType(DEFAULT_PROMO)
+                .setDiscountFraction(0.5)
+                .setDiscountYears(1)
+                .setAllowedTlds(ImmutableSet.of("tld"))
+                .build());
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
+            .build());
+    runFlowAssertResponse(
+        loadFile(
+            "domain_renew_response_fee.xml",
+            ImmutableMap.of(
+                "NAME",
+                "example.tld",
+                "PERIOD",
+                "5",
+                "EX_DATE",
+                "2005-04-03T22:00:00.0Z",
+                "FEE",
+                "49.50",
+                "CURRENCY",
+                "USD",
+                "FEE_VERSION",
+                "fee-0.11",
+                "FEE_NS",
+                "fee")));
+  }
+
+  @Test
+  void testFailure_wrongFeeAmountTooLow_defaultToken_v11() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_11_MAP);
+    persistDomain();
+    AllocationToken defaultToken1 =
+        persistResource(
+            new AllocationToken.Builder()
+                .setToken("aaaaa")
+                .setTokenType(DEFAULT_PROMO)
+                .setDiscountFraction(0.5)
+                .setDiscountYears(1)
+                .setAllowedTlds(ImmutableSet.of("tld"))
+                .build());
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
+            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
+            .build());
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_wrongFeeAmountTooHigh_defaultToken_v12() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_12_MAP);
+    persistDomain();
+    AllocationToken defaultToken1 =
+        persistResource(
+            new AllocationToken.Builder()
+                .setToken("aaaaa")
+                .setTokenType(DEFAULT_PROMO)
+                .setDiscountFraction(0.5)
+                .setDiscountYears(1)
+                .setAllowedTlds(ImmutableSet.of("tld"))
+                .build());
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
+            .build());
+    runFlowAssertResponse(
+        loadFile(
+            "domain_renew_response_fee.xml",
+            ImmutableMap.of(
+                "NAME",
+                "example.tld",
+                "PERIOD",
+                "5",
+                "EX_DATE",
+                "2005-04-03T22:00:00.0Z",
+                "FEE",
+                "49.50",
+                "CURRENCY",
+                "USD",
+                "FEE_VERSION",
+                "fee-0.12",
+                "FEE_NS",
+                "fee")));
+  }
+
+  @Test
+  void testFailure_wrongFeeAmountTooLow_defaultToken_v12() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_06_MAP);
+    persistDomain();
+    AllocationToken defaultToken1 =
+        persistResource(
+            new AllocationToken.Builder()
+                .setToken("aaaaa")
+                .setTokenType(DEFAULT_PROMO)
+                .setDiscountFraction(0.5)
+                .setDiscountYears(1)
+                .setAllowedTlds(ImmutableSet.of("tld"))
+                .build());
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setDefaultPromoTokens(ImmutableList.of(defaultToken1.createVKey()))
+            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
+            .build());
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_refundableFee_v06() throws Exception {
+    setEppInput("domain_renew_fee_refundable.xml", FEE_06_MAP);
+    persistDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_refundableFee_v11() throws Exception {
+    setEppInput("domain_renew_fee_refundable.xml", FEE_11_MAP);
+    persistDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_refundableFee_v12() throws Exception {
+    setEppInput("domain_renew_fee_refundable.xml", FEE_12_MAP);
+    persistDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_gracePeriodFee_v06() throws Exception {
+    setEppInput("domain_renew_fee_grace_period.xml", FEE_06_MAP);
+    persistDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_gracePeriodFee_v11() throws Exception {
+    setEppInput("domain_renew_fee_grace_period.xml", FEE_11_MAP);
+    persistDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_gracePeriodFee_v12() throws Exception {
+    setEppInput("domain_renew_fee_grace_period.xml", FEE_12_MAP);
+    persistDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_appliedFee_v06() throws Exception {
+    setEppInput("domain_renew_fee_applied.xml", FEE_06_MAP);
+    persistDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_appliedFee_v11() throws Exception {
+    setEppInput("domain_renew_fee_applied.xml", FEE_11_MAP);
+    persistDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_appliedFee_v12() throws Exception {
+    setEppInput("domain_renew_fee_applied.xml", FEE_12_MAP);
+    persistDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_fee_v06() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_06_MAP);
+    persistDomain();
+    doSuccessfulTest("domain_renew_response_fee.xml", 5, FEE_06_MAP);
+  }
+
+  @Test
+  void testSuccess_fee_v11() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_11_MAP);
+    persistDomain();
+    doSuccessfulTest("domain_renew_response_fee.xml", 5, FEE_11_MAP);
+  }
+
+  @Test
+  void testSuccess_fee_v12() throws Exception {
+    setEppInput("domain_renew_fee.xml", FEE_12_MAP);
+    persistDomain();
+    doSuccessfulTest("domain_renew_response_fee.xml", 5, FEE_12_MAP);
+  }
+
+  @Test
+  void testSuccess_fee_withDefaultAttributes_v06() throws Exception {
+    setEppInput("domain_renew_fee_defaults.xml", FEE_06_MAP);
+    persistDomain();
+    doSuccessfulTest("domain_renew_response_fee.xml", 5, FEE_06_MAP);
+  }
+
+  @Test
+  void testSuccess_fee_withDefaultAttributes_v11() throws Exception {
+    setEppInput("domain_renew_fee_defaults.xml", FEE_11_MAP);
+    persistDomain();
+    doSuccessfulTest("domain_renew_response_fee.xml", 5, FEE_11_MAP);
+  }
+
+  @Test
+  void testSuccess_fee_withDefaultAttributes_v12() throws Exception {
+    setEppInput("domain_renew_fee_defaults.xml", FEE_12_MAP);
+    persistDomain();
+    doSuccessfulTest("domain_renew_response_fee.xml", 5, FEE_12_MAP);
+  }
+
+  @Test
+  void testSuccess_anchorTenant_premiumDomain_v06() throws Exception {
+    persistResource(
+        Tld.get("tld")
+            .asBuilder()
+            .setPremiumList(persistPremiumList("tld", USD, "example,USD 100"))
+            .build());
+    persistDomain(NONPREMIUM, null);
+    setRegistrarIdForFlow("NewRegistrar");
+    ImmutableMap<String, String> customFeeMap = updateSubstitutions(FEE_06_MAP, "FEE", "55.00");
+    setEppInput("domain_renew_fee.xml", customFeeMap);
+    doSuccessfulTest(
+        "domain_renew_response_fee.xml",
+        5,
+        "NewRegistrar",
+        UserPrivileges.SUPERUSER,
+        customFeeMap,
+        Money.of(USD, 55),
+        NONPREMIUM,
+        null);
+  }
+
+  @Test
+  void testSuccess_customLogicFee_v06() throws Exception {
+    // The "costly-renew" domain has an additional RENEW fee of 100 from custom logic on top of the
+    // normal $11 standard renew price for this TLD.
+    ImmutableMap<String, String> customFeeMap =
+        updateSubstitutions(
+            FEE_06_MAP,
+            "NAME",
+            "costly-renew.tld",
+            "PERIOD",
+            "1",
+            "EX_DATE",
+            "2001-04-03T22:00:00.0Z",
+            "FEE",
+            "111.00");
+    setEppInput("domain_renew_fee.xml", customFeeMap);
+    persistDomain();
+    doSuccessfulTest(
+        "domain_renew_response_fee.xml",
+        1,
+        "TheRegistrar",
+        UserPrivileges.NORMAL,
+        customFeeMap,
+        Money.of(USD, 111));
+  }
 }

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

@@ -1,351 +0,0 @@
-// 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.domain;
-
-import static google.registry.testing.DatabaseHelper.createTld;
-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.joda.money.CurrencyUnit.EUR;
-import static org.joda.money.CurrencyUnit.USD;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
-import google.registry.flows.EppException;
-import google.registry.flows.FlowUtils.UnknownCurrencyEppException;
-import google.registry.flows.domain.DomainFlowUtils.CurrencyUnitMismatchException;
-import google.registry.flows.domain.DomainFlowUtils.CurrencyValueScaleException;
-import google.registry.flows.domain.DomainFlowUtils.FeesMismatchException;
-import google.registry.flows.domain.DomainFlowUtils.PremiumNameBlockedException;
-import google.registry.flows.domain.DomainFlowUtils.UnsupportedFeeAttributeException;
-import google.registry.model.domain.Domain;
-import google.registry.model.domain.DomainHistory;
-import google.registry.model.domain.GracePeriod;
-import google.registry.model.domain.rgp.GracePeriodStatus;
-import google.registry.model.eppcommon.StatusValue;
-import google.registry.model.poll.PollMessage;
-import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.tld.Tld;
-import google.registry.testing.DatabaseHelper;
-import java.util.Map;
-import org.joda.money.Money;
-import org.joda.time.DateTime;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/** Tests for {@link DomainRestoreRequestFlow} that use the old fee extensions (0.6, 0.11, 0.12). */
-public class DomainRestoreRequestFlowOldFeeExtensionsTest
-    extends ProductionSimulatingFeeExtensionsTest<DomainRestoreRequestFlow> {
-
-  private static final ImmutableMap<String, String> FEE_06_MAP =
-      ImmutableMap.of("FEE_VERSION", "fee-0.6", "FEE_NS", "fee", "CURRENCY", "USD");
-  private static final ImmutableMap<String, String> FEE_11_MAP =
-      ImmutableMap.of("FEE_VERSION", "fee-0.11", "FEE_NS", "fee11", "CURRENCY", "USD");
-  private static final ImmutableMap<String, String> FEE_12_MAP =
-      ImmutableMap.of("FEE_VERSION", "fee-0.12", "FEE_NS", "fee12", "CURRENCY", "USD");
-
-  @BeforeEach
-  void beforeEachDomainRestoreRequestFlowOldFeeExtensionsTest() {
-    createTld("tld");
-    persistResource(
-        loadRegistrar("TheRegistrar")
-            .asBuilder()
-            .setBillingAccountMap(ImmutableMap.of(USD, "123", EUR, "567"))
-            .build());
-    setEppInput("domain_update_restore_request.xml", ImmutableMap.of("DOMAIN", "example.tld"));
-  }
-
-  @Test
-  void testFailure_wrongFeeAmount_v06() throws Exception {
-    setEppInput("domain_update_restore_request_fee.xml", FEE_06_MAP);
-    persistPendingDeleteDomain();
-    persistResource(Tld.get("tld").asBuilder().setRestoreBillingCost(Money.of(USD, 100)).build());
-    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_wrongFeeAmount_v11() throws Exception {
-    setEppInput("domain_update_restore_request_fee.xml", FEE_11_MAP);
-    persistPendingDeleteDomain();
-    persistResource(Tld.get("tld").asBuilder().setRestoreBillingCost(Money.of(USD, 100)).build());
-    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_wrongFeeAmount_v12() throws Exception {
-    setEppInput("domain_update_restore_request_fee.xml", FEE_12_MAP);
-    persistPendingDeleteDomain();
-    persistResource(Tld.get("tld").asBuilder().setRestoreBillingCost(Money.of(USD, 100)).build());
-    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_feeGivenInWrongScale_v06() throws Exception {
-    setEppInput("domain_update_restore_request_fee_bad_scale.xml", FEE_06_MAP);
-    persistPendingDeleteDomain();
-    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_feeGivenInWrongScale_v11() throws Exception {
-    setEppInput("domain_update_restore_request_fee_bad_scale.xml", FEE_11_MAP);
-    persistPendingDeleteDomain();
-    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_feeGivenInWrongScale_v12() throws Exception {
-    setEppInput("domain_update_restore_request_fee_bad_scale.xml", FEE_12_MAP);
-    persistPendingDeleteDomain();
-    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_appliedFee_v06() throws Exception {
-    setEppInput("domain_update_restore_request_fee_applied.xml", FEE_06_MAP);
-    persistPendingDeleteDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_appliedFee_v11() throws Exception {
-    setEppInput("domain_update_restore_request_fee_applied.xml", FEE_11_MAP);
-    persistPendingDeleteDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_appliedFee_v12() throws Exception {
-    setEppInput("domain_update_restore_request_fee_applied.xml", FEE_12_MAP);
-    persistPendingDeleteDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testSuccess_fee_withDefaultAttributes_v06() throws Exception {
-    setEppInput("domain_update_restore_request_fee_defaults.xml", FEE_06_MAP);
-    persistPendingDeleteDomain();
-    runFlowAssertResponse(loadFile("domain_update_restore_request_response_fee.xml", FEE_06_MAP));
-  }
-
-  @Test
-  void testSuccess_fee_withDefaultAttributes_v11() throws Exception {
-    setEppInput("domain_update_restore_request_fee_defaults.xml", FEE_11_MAP);
-    persistPendingDeleteDomain();
-    runFlowAssertResponse(loadFile("domain_update_restore_request_response_fee.xml", FEE_11_MAP));
-  }
-
-  @Test
-  void testSuccess_fee_withDefaultAttributes_v12() throws Exception {
-    setEppInput("domain_update_restore_request_fee_defaults.xml", FEE_12_MAP);
-    persistPendingDeleteDomain();
-    runFlowAssertResponse(loadFile("domain_update_restore_request_response_fee.xml", FEE_12_MAP));
-  }
-
-  @Test
-  void testSuccess_fee_v06() throws Exception {
-    setEppInput("domain_update_restore_request_fee.xml", FEE_06_MAP);
-    persistPendingDeleteDomain();
-    runFlowAssertResponse(loadFile("domain_update_restore_request_response_fee.xml", FEE_06_MAP));
-  }
-
-  @Test
-  void testSuccess_fee_v06_noRenewal() throws Exception {
-    setEppInput("domain_update_restore_request_fee_no_renewal.xml", FEE_06_MAP);
-    persistPendingDeleteDomain(clock.nowUtc().plusMonths(6));
-    runFlowAssertResponse(
-        loadFile("domain_update_restore_request_response_fee_no_renewal.xml", FEE_06_MAP));
-  }
-
-  @Test
-  void testSuccess_fee_v11() throws Exception {
-    setEppInput("domain_update_restore_request_fee.xml", FEE_11_MAP);
-    persistPendingDeleteDomain();
-    runFlowAssertResponse(loadFile("domain_update_restore_request_response_fee.xml", FEE_11_MAP));
-  }
-
-  @Test
-  void testSuccess_fee_v12() throws Exception {
-    setEppInput("domain_update_restore_request_fee.xml", FEE_12_MAP);
-    persistPendingDeleteDomain();
-    runFlowAssertResponse(loadFile("domain_update_restore_request_response_fee.xml", FEE_12_MAP));
-  }
-
-  @Test
-  void testFailure_refundableFee_v06() throws Exception {
-    setEppInput("domain_update_restore_request_fee_refundable.xml", FEE_06_MAP);
-    persistPendingDeleteDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_refundableFee_v11() throws Exception {
-    setEppInput("domain_update_restore_request_fee_refundable.xml", FEE_11_MAP);
-    persistPendingDeleteDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_refundableFee_v12() throws Exception {
-    setEppInput("domain_update_restore_request_fee_refundable.xml", FEE_12_MAP);
-    persistPendingDeleteDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_gracePeriodFee_v06() throws Exception {
-    setEppInput("domain_update_restore_request_fee_grace_period.xml", FEE_06_MAP);
-    persistPendingDeleteDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_gracePeriodFee_v11() throws Exception {
-    setEppInput("domain_update_restore_request_fee_grace_period.xml", FEE_11_MAP);
-    persistPendingDeleteDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_gracePeriodFee_v12() throws Exception {
-    setEppInput("domain_update_restore_request_fee_grace_period.xml", FEE_12_MAP);
-    persistPendingDeleteDomain();
-    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  private void runWrongCurrencyTest(Map<String, String> substitutions) throws Exception {
-    setEppInput("domain_update_restore_request_fee.xml", substitutions);
-    persistPendingDeleteDomain();
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setCurrency(EUR)
-            .setCreateBillingCostTransitions(
-                ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 13)))
-            .setRestoreBillingCost(Money.of(EUR, 11))
-            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(EUR, 7)))
-            .setEapFeeSchedule(ImmutableSortedMap.of(START_OF_TIME, Money.zero(EUR)))
-            .setServerStatusChangeBillingCost(Money.of(EUR, 19))
-            .setRegistryLockOrUnlockBillingCost(Money.of(EUR, 0))
-            .build());
-    EppException thrown = assertThrows(CurrencyUnitMismatchException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_wrongCurrency_v06() throws Exception {
-    runWrongCurrencyTest(FEE_06_MAP);
-  }
-
-  @Test
-  void testFailure_wrongCurrency_v11() throws Exception {
-    runWrongCurrencyTest(FEE_11_MAP);
-  }
-
-  @Test
-  void testFailure_wrongCurrency_v12() throws Exception {
-    runWrongCurrencyTest(FEE_12_MAP);
-  }
-
-  @Test
-  void testFailure_premiumBlocked_v12() throws Exception {
-    createTld("example");
-    setEppInput("domain_update_restore_request_premium.xml", FEE_12_MAP);
-    persistPendingDeleteDomain();
-    // Modify the Registrar to block premium names.
-    persistResource(loadRegistrar("TheRegistrar").asBuilder().setBlockPremiumNames(true).build());
-    EppException thrown = assertThrows(PremiumNameBlockedException.class, this::runFlow);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testSuccess_premiumNotBlocked_andNoRenewal_v12() throws Exception {
-    createTld("example");
-    setEppInput("domain_update_restore_request_premium_no_renewal.xml", FEE_12_MAP);
-    persistPendingDeleteDomain(clock.nowUtc().plusYears(2));
-    runFlowAssertResponse(
-        loadFile("domain_update_restore_request_response_fee_no_renewal.xml", FEE_12_MAP));
-  }
-
-  @Test
-  void testFailure_fee_unknownCurrency_v12() {
-    ImmutableMap<String, String> substitutions =
-        ImmutableMap.of("FEE_VERSION", "fee-0.12", "FEE_NS", "fee12", "CURRENCY", "BAD");
-    setEppInput("domain_update_restore_request_fee.xml", substitutions);
-    EppException thrown =
-        assertThrows(UnknownCurrencyEppException.class, this::persistPendingDeleteDomain);
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  private Domain persistPendingDeleteDomain() throws Exception {
-    // The domain is now past what had been its expiration date at the time of deletion.
-    return persistPendingDeleteDomain(clock.nowUtc().minusDays(5));
-  }
-
-  private Domain persistPendingDeleteDomain(DateTime expirationTime) throws Exception {
-    Domain domain = persistResource(DatabaseHelper.newDomain(getUniqueIdFromCommand()));
-    HistoryEntry historyEntry =
-        persistResource(
-            new DomainHistory.Builder()
-                .setType(HistoryEntry.Type.DOMAIN_DELETE)
-                .setModificationTime(clock.nowUtc())
-                .setRegistrarId(domain.getCurrentSponsorRegistrarId())
-                .setDomain(domain)
-                .build());
-    domain =
-        persistResource(
-            domain
-                .asBuilder()
-                .setRegistrationExpirationTime(expirationTime)
-                .setDeletionTime(clock.nowUtc().plusDays(35))
-                .addGracePeriod(
-                    GracePeriod.create(
-                        GracePeriodStatus.REDEMPTION,
-                        domain.getRepoId(),
-                        clock.nowUtc().plusDays(1),
-                        "TheRegistrar",
-                        null))
-                .setStatusValues(ImmutableSet.of(StatusValue.PENDING_DELETE))
-                .setDeletePollMessage(
-                    persistResource(
-                            new PollMessage.OneTime.Builder()
-                                .setRegistrarId("TheRegistrar")
-                                .setEventTime(clock.nowUtc().plusDays(5))
-                                .setHistoryEntry(historyEntry)
-                                .build())
-                        .createVKey())
-                .build());
-    clock.advanceOneMilli();
-    return domain;
-  }
-}

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

@@ -86,6 +86,12 @@ import org.junit.jupiter.api.Test;
 /** Unit tests for {@link DomainRestoreRequestFlow}. */
 class DomainRestoreRequestFlowTest extends ResourceFlowTestCase<DomainRestoreRequestFlow, Domain> {
 
+  private static final ImmutableMap<String, String> FEE_06_MAP =
+      ImmutableMap.of("FEE_VERSION", "fee-0.6", "FEE_NS", "fee", "CURRENCY", "USD");
+  private static final ImmutableMap<String, String> FEE_11_MAP =
+      ImmutableMap.of("FEE_VERSION", "fee-0.11", "FEE_NS", "fee11", "CURRENCY", "USD");
+  private static final ImmutableMap<String, String> FEE_12_MAP =
+      ImmutableMap.of("FEE_VERSION", "fee-0.12", "FEE_NS", "fee12", "CURRENCY", "USD");
   private static final ImmutableMap<String, String> FEE_STD_1_0_MAP =
       ImmutableMap.of("FEE_VERSION", "epp:fee-1.0", "FEE_NS", "fee1_00", "CURRENCY", "USD");
 
@@ -677,4 +683,222 @@ class DomainRestoreRequestFlowTest extends ResourceFlowTestCase<DomainRestoreReq
     assertThat(thrown).hasMessageThat().contains("domain restore reports are not supported");
     assertAboutEppExceptions().that(thrown).marshalsToXml();
   }
+
+  @Test
+  void testFailure_wrongFeeAmount_v06() throws Exception {
+    setEppInput("domain_update_restore_request_fee.xml", FEE_06_MAP);
+    persistPendingDeleteDomain();
+    persistResource(Tld.get("tld").asBuilder().setRestoreBillingCost(Money.of(USD, 100)).build());
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongFeeAmount_v11() throws Exception {
+    setEppInput("domain_update_restore_request_fee.xml", FEE_11_MAP);
+    persistPendingDeleteDomain();
+    persistResource(Tld.get("tld").asBuilder().setRestoreBillingCost(Money.of(USD, 100)).build());
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongFeeAmount_v12() throws Exception {
+    setEppInput("domain_update_restore_request_fee.xml", FEE_12_MAP);
+    persistPendingDeleteDomain();
+    persistResource(Tld.get("tld").asBuilder().setRestoreBillingCost(Money.of(USD, 100)).build());
+    EppException thrown = assertThrows(FeesMismatchException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_feeGivenInWrongScale_v06() throws Exception {
+    setEppInput("domain_update_restore_request_fee_bad_scale.xml", FEE_06_MAP);
+    persistPendingDeleteDomain();
+    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_feeGivenInWrongScale_v11() throws Exception {
+    setEppInput("domain_update_restore_request_fee_bad_scale.xml", FEE_11_MAP);
+    persistPendingDeleteDomain();
+    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_feeGivenInWrongScale_v12() throws Exception {
+    setEppInput("domain_update_restore_request_fee_bad_scale.xml", FEE_12_MAP);
+    persistPendingDeleteDomain();
+    EppException thrown = assertThrows(CurrencyValueScaleException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_appliedFee_v06() throws Exception {
+    setEppInput("domain_update_restore_request_fee_applied.xml", FEE_06_MAP);
+    persistPendingDeleteDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_appliedFee_v11() throws Exception {
+    setEppInput("domain_update_restore_request_fee_applied.xml", FEE_11_MAP);
+    persistPendingDeleteDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_appliedFee_v12() throws Exception {
+    setEppInput("domain_update_restore_request_fee_applied.xml", FEE_12_MAP);
+    persistPendingDeleteDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_fee_withDefaultAttributes_v06() throws Exception {
+    setEppInput("domain_update_restore_request_fee_defaults.xml", FEE_06_MAP);
+    persistPendingDeleteDomain();
+    runFlowAssertResponse(loadFile("domain_update_restore_request_response_fee.xml", FEE_06_MAP));
+  }
+
+  @Test
+  void testSuccess_fee_withDefaultAttributes_v11() throws Exception {
+    setEppInput("domain_update_restore_request_fee_defaults.xml", FEE_11_MAP);
+    persistPendingDeleteDomain();
+    runFlowAssertResponse(loadFile("domain_update_restore_request_response_fee.xml", FEE_11_MAP));
+  }
+
+  @Test
+  void testSuccess_fee_withDefaultAttributes_v12() throws Exception {
+    setEppInput("domain_update_restore_request_fee_defaults.xml", FEE_12_MAP);
+    persistPendingDeleteDomain();
+    runFlowAssertResponse(loadFile("domain_update_restore_request_response_fee.xml", FEE_12_MAP));
+  }
+
+  @Test
+  void testSuccess_fee_v06() throws Exception {
+    setEppInput("domain_update_restore_request_fee.xml", FEE_06_MAP);
+    persistPendingDeleteDomain();
+    runFlowAssertResponse(loadFile("domain_update_restore_request_response_fee.xml", FEE_06_MAP));
+  }
+
+  @Test
+  void testSuccess_fee_v06_noRenewal() throws Exception {
+    setEppInput("domain_update_restore_request_fee_no_renewal.xml", FEE_06_MAP);
+    persistPendingDeleteDomain(clock.nowUtc().plusMonths(6));
+    runFlowAssertResponse(
+        loadFile("domain_update_restore_request_response_fee_no_renewal.xml", FEE_06_MAP));
+  }
+
+  @Test
+  void testSuccess_fee_v11() throws Exception {
+    setEppInput("domain_update_restore_request_fee.xml", FEE_11_MAP);
+    persistPendingDeleteDomain();
+    runFlowAssertResponse(loadFile("domain_update_restore_request_response_fee.xml", FEE_11_MAP));
+  }
+
+  @Test
+  void testSuccess_fee_v12() throws Exception {
+    setEppInput("domain_update_restore_request_fee.xml", FEE_12_MAP);
+    persistPendingDeleteDomain();
+    runFlowAssertResponse(loadFile("domain_update_restore_request_response_fee.xml", FEE_12_MAP));
+  }
+
+  @Test
+  void testFailure_refundableFee_v06() throws Exception {
+    setEppInput("domain_update_restore_request_fee_refundable.xml", FEE_06_MAP);
+    persistPendingDeleteDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_refundableFee_v11() throws Exception {
+    setEppInput("domain_update_restore_request_fee_refundable.xml", FEE_11_MAP);
+    persistPendingDeleteDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_refundableFee_v12() throws Exception {
+    setEppInput("domain_update_restore_request_fee_refundable.xml", FEE_12_MAP);
+    persistPendingDeleteDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_gracePeriodFee_v06() throws Exception {
+    setEppInput("domain_update_restore_request_fee_grace_period.xml", FEE_06_MAP);
+    persistPendingDeleteDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_gracePeriodFee_v11() throws Exception {
+    setEppInput("domain_update_restore_request_fee_grace_period.xml", FEE_11_MAP);
+    persistPendingDeleteDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_gracePeriodFee_v12() throws Exception {
+    setEppInput("domain_update_restore_request_fee_grace_period.xml", FEE_12_MAP);
+    persistPendingDeleteDomain();
+    EppException thrown = assertThrows(UnsupportedFeeAttributeException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongCurrency_v06() throws Exception {
+    runWrongCurrencyTest(FEE_06_MAP);
+  }
+
+  @Test
+  void testFailure_wrongCurrency_v11() throws Exception {
+    runWrongCurrencyTest(FEE_11_MAP);
+  }
+
+  @Test
+  void testFailure_wrongCurrency_v12() throws Exception {
+    runWrongCurrencyTest(FEE_12_MAP);
+  }
+
+  @Test
+  void testFailure_premiumBlocked_v12() throws Exception {
+    createTld("example");
+    setEppInput("domain_update_restore_request_premium.xml", FEE_12_MAP);
+    persistPendingDeleteDomain();
+    // Modify the Registrar to block premium names.
+    persistResource(loadRegistrar("TheRegistrar").asBuilder().setBlockPremiumNames(true).build());
+    EppException thrown = assertThrows(PremiumNameBlockedException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_premiumNotBlocked_andNoRenewal_v12() throws Exception {
+    createTld("example");
+    setEppInput("domain_update_restore_request_premium_no_renewal.xml", FEE_12_MAP);
+    persistPendingDeleteDomain(clock.nowUtc().plusYears(2));
+    runFlowAssertResponse(
+        loadFile("domain_update_restore_request_response_fee_no_renewal.xml", FEE_12_MAP));
+  }
+
+  @Test
+  void testFailure_fee_unknownCurrency_v12() {
+    ImmutableMap<String, String> substitutions =
+        ImmutableMap.of("FEE_VERSION", "fee-0.12", "FEE_NS", "fee12", "CURRENCY", "BAD");
+    setEppInput("domain_update_restore_request_fee.xml", substitutions);
+    EppException thrown =
+        assertThrows(UnknownCurrencyEppException.class, this::persistPendingDeleteDomain);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
 }

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

@@ -1,897 +0,0 @@
-// 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.domain;
-
-import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.common.collect.MoreCollectors.onlyElement;
-import static com.google.common.truth.Truth.assertThat;
-import static google.registry.batch.AsyncTaskEnqueuer.PARAM_REQUESTED_TIME;
-import static google.registry.batch.AsyncTaskEnqueuer.PARAM_RESOURCE_KEY;
-import static google.registry.batch.AsyncTaskEnqueuer.QUEUE_ASYNC_ACTIONS;
-import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_CREATE;
-import static google.registry.model.reporting.HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST;
-import static google.registry.testing.DatabaseHelper.assertBillingEvents;
-import static google.registry.testing.DatabaseHelper.assertBillingEventsEqual;
-import static google.registry.testing.DatabaseHelper.assertPollMessagesEqual;
-import static google.registry.testing.DatabaseHelper.createTld;
-import static google.registry.testing.DatabaseHelper.getOnlyHistoryEntryOfType;
-import static google.registry.testing.DatabaseHelper.getOnlyPollMessage;
-import static google.registry.testing.DatabaseHelper.getPollMessages;
-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.persistDomainWithDependentResources;
-import static google.registry.testing.DatabaseHelper.persistResource;
-import static google.registry.testing.DomainSubject.assertAboutDomains;
-import static google.registry.testing.EppExceptionSubject.assertAboutEppExceptions;
-import static google.registry.testing.HistoryEntrySubject.assertAboutHistoryEntries;
-import static google.registry.testing.HostSubject.assertAboutHosts;
-import static google.registry.util.DateTimeUtils.END_OF_TIME;
-import static google.registry.util.DateTimeUtils.START_OF_TIME;
-import static org.joda.money.CurrencyUnit.USD;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import com.google.cloud.tasks.v2.HttpMethod;
-import com.google.common.base.Ascii;
-import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
-import com.google.common.collect.Streams;
-import google.registry.batch.ResaveEntityAction;
-import google.registry.flows.EppException;
-import google.registry.flows.EppRequestSource;
-import google.registry.flows.domain.DomainFlowUtils.CurrencyUnitMismatchException;
-import google.registry.flows.domain.DomainFlowUtils.CurrencyValueScaleException;
-import google.registry.flows.domain.DomainFlowUtils.FeesMismatchException;
-import google.registry.flows.domain.DomainFlowUtils.UnsupportedFeeAttributeException;
-import google.registry.flows.exceptions.TransferPeriodZeroAndFeeTransferExtensionException;
-import google.registry.model.billing.BillingBase;
-import google.registry.model.billing.BillingBase.Flag;
-import google.registry.model.billing.BillingBase.Reason;
-import google.registry.model.billing.BillingCancellation;
-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.domain.GracePeriod;
-import google.registry.model.domain.Period;
-import google.registry.model.domain.Period.Unit;
-import google.registry.model.domain.rgp.GracePeriodStatus;
-import google.registry.model.eppcommon.StatusValue;
-import google.registry.model.eppcommon.Trid;
-import google.registry.model.host.Host;
-import google.registry.model.poll.PendingActionNotificationResponse;
-import google.registry.model.poll.PollMessage;
-import google.registry.model.reporting.HistoryEntry;
-import google.registry.model.tld.Tld;
-import google.registry.model.transfer.DomainTransferData;
-import google.registry.model.transfer.TransferResponse;
-import google.registry.model.transfer.TransferStatus;
-import google.registry.testing.CloudTasksHelper.TaskMatcher;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Stream;
-import org.joda.money.Money;
-import org.joda.time.DateTime;
-import org.joda.time.Duration;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-/**
- * Tests for {@link DomainTransferRequestFlow} that use the old fee extensions (0.6, 0.11, 0.12).
- */
-public class DomainTransferRequestFlowOldFeeExtensionsTest
-    extends ProductionSimulatingFeeExtensionsTest<DomainTransferRequestFlow> {
-
-  private static final ImmutableMap<String, String> BASE_FEE_MAP =
-      new ImmutableMap.Builder<String, String>()
-          .put("DOMAIN", "example.tld")
-          .put("YEARS", "1")
-          .put("AMOUNT", "11.00")
-          .put("CURRENCY", "USD")
-          .build();
-  private static final ImmutableMap<String, String> FEE_06_MAP =
-      new ImmutableMap.Builder<String, String>()
-          .putAll(BASE_FEE_MAP)
-          .put("FEE_VERSION", "fee-0.6")
-          .put("FEE_NS", "fee")
-          .build();
-  private static final ImmutableMap<String, String> FEE_11_MAP =
-      new ImmutableMap.Builder<String, String>()
-          .putAll(BASE_FEE_MAP)
-          .put("FEE_VERSION", "fee-0.11")
-          .put("FEE_NS", "fee11")
-          .build();
-  private static final ImmutableMap<String, String> FEE_12_MAP =
-      new ImmutableMap.Builder<String, String>()
-          .putAll(BASE_FEE_MAP)
-          .put("FEE_VERSION", "fee-0.12")
-          .put("FEE_NS", "fee12")
-          .build();
-  private static final ImmutableMap<String, String> RICH_DOMAIN_MAP =
-      ImmutableMap.<String, String>builder()
-          .put("DOMAIN", "rich.example")
-          .put("YEARS", "1")
-          .put("AMOUNT", "100.00")
-          .put("CURRENCY", "USD")
-          .put("FEE_VERSION", "fee-0.12")
-          .put("FEE_NS", "fee12")
-          .build();
-
-  private static final DateTime TRANSFER_REQUEST_TIME = DateTime.parse("2000-06-06T22:00:00.0Z");
-  private static final DateTime TRANSFER_EXPIRATION_TIME =
-      TRANSFER_REQUEST_TIME.plus(Tld.DEFAULT_AUTOMATIC_TRANSFER_LENGTH);
-  private static final Duration TIME_SINCE_REQUEST = Duration.standardDays(3);
-  private static final int EXTENDED_REGISTRATION_YEARS = 1;
-  private static final DateTime REGISTRATION_EXPIRATION_TIME =
-      DateTime.parse("2001-09-08T22:00:00.0Z");
-  private static final DateTime EXTENDED_REGISTRATION_EXPIRATION_TIME =
-      REGISTRATION_EXPIRATION_TIME.plusYears(EXTENDED_REGISTRATION_YEARS);
-
-  private Contact contact;
-  private Domain domain;
-  private Host subordinateHost;
-  private DomainHistory historyEntryDomainCreate;
-
-  @BeforeEach
-  void beforeEachDomainTransferRequestFlowOldFeeExtensionsTest() {
-    setEppInput("domain_transfer_request.xml");
-    setRegistrarIdForFlow("NewRegistrar");
-    clock.setTo(TRANSFER_REQUEST_TIME.plus(TIME_SINCE_REQUEST));
-  }
-
-  @Test
-  void testFailure_wrongFeeAmount_v06() {
-    setupDomain("example", "tld");
-    runWrongFeeAmountTest(FEE_06_MAP);
-  }
-
-  @Test
-  void testFailure_wrongFeeAmount_v11() {
-    setupDomain("example", "tld");
-    runWrongFeeAmountTest(FEE_11_MAP);
-  }
-
-  @Test
-  void testFailure_wrongFeeAmount_v12() {
-    setupDomain("example", "tld");
-    runWrongFeeAmountTest(FEE_12_MAP);
-  }
-
-  @Test
-  void testFailure_appliedFee_v06() {
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            UnsupportedFeeAttributeException.class,
-            () -> doFailingTest("domain_transfer_request_fee_applied.xml", FEE_06_MAP));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_appliedFee_v11() {
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            UnsupportedFeeAttributeException.class,
-            () -> doFailingTest("domain_transfer_request_fee_applied.xml", FEE_11_MAP));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_appliedFee_v12() {
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            UnsupportedFeeAttributeException.class,
-            () -> doFailingTest("domain_transfer_request_fee_applied.xml", FEE_12_MAP));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_gracePeriodFee_v06() {
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            UnsupportedFeeAttributeException.class,
-            () -> doFailingTest("domain_transfer_request_fee_grace_period.xml", FEE_06_MAP));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_gracePeriodFee_v11() {
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            UnsupportedFeeAttributeException.class,
-            () -> doFailingTest("domain_transfer_request_fee_grace_period.xml", FEE_11_MAP));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_gracePeriodFee_v12() {
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            UnsupportedFeeAttributeException.class,
-            () -> doFailingTest("domain_transfer_request_fee_grace_period.xml", FEE_12_MAP));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testSuccess_fee_withDefaultAttributes_v06() throws Exception {
-    setupDomain("example", "tld");
-    doSuccessfulTest(
-        "domain_transfer_request_fee_defaults.xml",
-        "domain_transfer_request_response_fee.xml",
-        FEE_06_MAP);
-  }
-
-  @Test
-  void testSuccess_fee_withDefaultAttributes_v11() throws Exception {
-    setupDomain("example", "tld");
-    doSuccessfulTest(
-        "domain_transfer_request_fee_defaults.xml",
-        "domain_transfer_request_response_fee.xml",
-        FEE_11_MAP);
-  }
-
-  @Test
-  void testSuccess_fee_withDefaultAttributes_v12() throws Exception {
-    setupDomain("example", "tld");
-    doSuccessfulTest(
-        "domain_transfer_request_fee_defaults.xml",
-        "domain_transfer_request_response_fee.xml",
-        FEE_12_MAP);
-  }
-
-  @Test
-  void testFailure_refundableFee_v06() {
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            UnsupportedFeeAttributeException.class,
-            () -> doFailingTest("domain_transfer_request_fee_refundable.xml", FEE_06_MAP));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_refundableFee_v11() {
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            UnsupportedFeeAttributeException.class,
-            () -> doFailingTest("domain_transfer_request_fee_refundable.xml", FEE_11_MAP));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_refundableFee_v12() {
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            UnsupportedFeeAttributeException.class,
-            () -> doFailingTest("domain_transfer_request_fee_refundable.xml", FEE_12_MAP));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_wrongCurrency_v06() {
-    runWrongCurrencyTest(FEE_06_MAP);
-  }
-
-  @Test
-  void testFailure_wrongCurrency_v11() {
-    runWrongCurrencyTest(FEE_11_MAP);
-  }
-
-  @Test
-  void testFailure_wrongCurrency_v12() {
-    runWrongCurrencyTest(FEE_12_MAP);
-  }
-
-  @Test
-  void testFailure_feeGivenInWrongScale_v06() {
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            CurrencyValueScaleException.class,
-            () -> doFailingTest("domain_transfer_request_fee_bad_scale.xml", FEE_06_MAP));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_feeGivenInWrongScale_v11() {
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            CurrencyValueScaleException.class,
-            () -> doFailingTest("domain_transfer_request_fee_bad_scale.xml", FEE_11_MAP));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testFailure_feeGivenInWrongScale_v12() {
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            CurrencyValueScaleException.class,
-            () -> doFailingTest("domain_transfer_request_fee_bad_scale.xml", FEE_12_MAP));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  @Test
-  void testSuccess_fee_v06() throws Exception {
-    setupDomain("example", "tld");
-    doSuccessfulTest(
-        "domain_transfer_request_fee.xml", "domain_transfer_request_response_fee.xml", FEE_06_MAP);
-  }
-
-  @Test
-  void testSuccess_fee_v11() throws Exception {
-    setupDomain("example", "tld");
-    doSuccessfulTest(
-        "domain_transfer_request_fee.xml", "domain_transfer_request_response_fee.xml", FEE_11_MAP);
-  }
-
-  @Test
-  void testSuccess_fee_v12() throws Exception {
-    setupDomain("example", "tld");
-    doSuccessfulTest(
-        "domain_transfer_request_fee.xml", "domain_transfer_request_response_fee.xml", FEE_12_MAP);
-  }
-
-  @Test
-  void testSuccess_customLogicFee_v06() throws Exception {
-    setupDomain("expensive-domain", "foo");
-    clock.advanceOneMilli();
-    doSuccessfulTest(
-        "domain_transfer_request_separate_fees.xml",
-        "domain_transfer_request_response_fees.xml",
-        domain.getRegistrationExpirationTime().plusYears(1),
-        new ImmutableMap.Builder<String, String>()
-            .put("DOMAIN", "expensive-domain.foo")
-            .put("YEARS", "1")
-            .put("AMOUNT", "111.00")
-            .put("EXDATE", "2002-09-08T22:00:00.0Z")
-            .put("FEE_VERSION", "fee-0.6")
-            .put("FEE_NS", "fee")
-            .build(),
-        Optional.of(Money.of(USD, 111)));
-  }
-
-  @Test
-  void testSuccess_premiumNotBlocked_v12() throws Exception {
-    setupDomain("rich", "example");
-    clock.advanceOneMilli();
-    // We don't verify the results; just check that the flow doesn't fail.
-    runTest("domain_transfer_request_fee.xml", UserPrivileges.NORMAL, RICH_DOMAIN_MAP);
-  }
-
-  @Test
-  void testFailure_superuserExtension_zeroPeriod_feeTransferExtension_v12() {
-    setupDomain("example", "tld");
-    eppRequestSource = EppRequestSource.TOOL;
-    clock.advanceOneMilli();
-    assertThrows(
-        TransferPeriodZeroAndFeeTransferExtensionException.class,
-        () ->
-            runTest(
-                "domain_transfer_request_fee_and_superuser_extension.xml",
-                UserPrivileges.SUPERUSER,
-                new ImmutableMap.Builder<String, String>()
-                    .putAll(FEE_12_MAP)
-                    .put("PERIOD", "0")
-                    .put("AUTOMATIC_TRANSFER_LENGTH", "5")
-                    .build()));
-  }
-
-  @Test
-  void testSuccess_premiumNotBlockedInSuperuserMode_v12() throws Exception {
-    setupDomain("rich", "example");
-    clock.advanceOneMilli();
-    // Modify the Registrar to block premium names.
-    persistResource(loadRegistrar("NewRegistrar").asBuilder().setBlockPremiumNames(true).build());
-    // We don't verify the results; just check that the flow doesn't fail.
-    runTest("domain_transfer_request_fee.xml", UserPrivileges.SUPERUSER, RICH_DOMAIN_MAP);
-  }
-
-  private void runWrongCurrencyTest(Map<String, String> substitutions) {
-    Map<String, String> fullSubstitutions = Maps.newHashMap();
-    fullSubstitutions.putAll(substitutions);
-    fullSubstitutions.put("CURRENCY", "EUR");
-    setupDomain("example", "tld");
-    EppException thrown =
-        assertThrows(
-            CurrencyUnitMismatchException.class,
-            () -> doFailingTest("domain_transfer_request_fee.xml", fullSubstitutions));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  /**
-   * Runs a successful test. The extraExpectedBillingEvents parameter consists of cancellation
-   * billing event builders that have had all of their attributes set except for the parent history
-   * entry, which is filled in during the execution of this method.
-   */
-  private void doSuccessfulTest(
-      String commandFilename,
-      String expectedXmlFilename,
-      DateTime expectedExpirationTime,
-      Map<String, String> substitutions,
-      Optional<Money> transferCost,
-      BillingCancellation.Builder... extraExpectedBillingEvents)
-      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.
-    Tld registry = Tld.get(domain.getTld());
-    DateTime implicitTransferTime = clock.nowUtc().plus(registry.getAutomaticTransferLength());
-    // Setup done; run the test.
-    assertMutatingFlow(true);
-    runFlowAssertResponse(loadFile(expectedXmlFilename, substitutions));
-    // Transfer should have been requested.
-    domain = reloadResourceByForeignKey();
-    // Verify that HistoryEntry was created.
-    assertAboutDomains()
-        .that(domain)
-        .hasOneHistoryEntryEachOfTypes(DOMAIN_CREATE, DOMAIN_TRANSFER_REQUEST);
-    assertLastHistoryContainsResource(domain);
-    final HistoryEntry historyEntryTransferRequest =
-        getOnlyHistoryEntryOfType(domain, DOMAIN_TRANSFER_REQUEST);
-    assertAboutHistoryEntries()
-        .that(historyEntryTransferRequest)
-        .hasPeriodYears(1)
-        .and()
-        .hasOtherRegistrarId("TheRegistrar");
-    // Verify correct fields were set.
-    assertTransferRequested(
-        domain, implicitTransferTime, Period.create(1, Unit.YEARS), expectedExpirationTime);
-
-    subordinateHost = reloadResourceAndCloneAtTime(subordinateHost, clock.nowUtc());
-    assertAboutHosts().that(subordinateHost).hasNoHistoryEntries();
-
-    assertHistoryEntriesContainBillingEventsAndGracePeriods(
-        expectedExpirationTime,
-        implicitTransferTime,
-        transferCost,
-        originalGracePeriods,
-        /* expectTransferBillingEvent= */ true,
-        extraExpectedBillingEvents);
-
-    assertPollMessagesEmitted(expectedExpirationTime, implicitTransferTime);
-    assertAboutDomainAfterAutomaticTransfer(
-        expectedExpirationTime, implicitTransferTime, Period.create(1, Unit.YEARS));
-    cloudTasksHelper.assertTasksEnqueued(
-        QUEUE_ASYNC_ACTIONS,
-        new TaskMatcher()
-            .path(ResaveEntityAction.PATH)
-            .method(HttpMethod.POST)
-            .service("backend")
-            .header("content-type", "application/x-www-form-urlencoded")
-            .param(PARAM_RESOURCE_KEY, domain.createVKey().stringify())
-            .param(PARAM_REQUESTED_TIME, clock.nowUtc().toString())
-            .scheduleTime(clock.nowUtc().plus(registry.getAutomaticTransferLength())));
-  }
-
-  private void doSuccessfulTest(
-      String commandFilename, String expectedXmlFilename, Map<String, String> substitutions)
-      throws Exception {
-    clock.advanceOneMilli();
-    doSuccessfulTest(
-        commandFilename,
-        expectedXmlFilename,
-        domain.getRegistrationExpirationTime().plusYears(1),
-        substitutions,
-        Optional.empty());
-  }
-
-  private void doSuccessfulTest(String commandFilename, String expectedXmlFilename)
-      throws Exception {
-    clock.advanceOneMilli();
-    doSuccessfulTest(
-        commandFilename, expectedXmlFilename, domain.getRegistrationExpirationTime().plusYears(1));
-  }
-
-  private void doSuccessfulTest(
-      String commandFilename,
-      String expectedXmlFilename,
-      DateTime expectedExpirationTime,
-      BillingCancellation.Builder... extraExpectedBillingEvents)
-      throws Exception {
-    doSuccessfulTest(
-        commandFilename,
-        expectedXmlFilename,
-        expectedExpirationTime,
-        ImmutableMap.of(),
-        Optional.empty(),
-        extraExpectedBillingEvents);
-  }
-
-  private void runWrongFeeAmountTest(Map<String, String> substitutions) {
-    persistResource(
-        Tld.get("tld")
-            .asBuilder()
-            .setRenewBillingCostTransitions(ImmutableSortedMap.of(START_OF_TIME, Money.of(USD, 20)))
-            .build());
-    EppException thrown =
-        assertThrows(
-            FeesMismatchException.class,
-            () -> doFailingTest("domain_transfer_request_fee.xml", substitutions));
-    assertAboutEppExceptions().that(thrown).marshalsToXml();
-  }
-
-  private void runTest(
-      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);
-  }
-
-  private void runTest(String commandFilename, UserPrivileges userPrivileges) throws Exception {
-    runTest(commandFilename, userPrivileges, ImmutableMap.of());
-  }
-
-  private void doFailingTest(String commandFilename, Map<String, String> substitutions)
-      throws Exception {
-    runTest(commandFilename, UserPrivileges.NORMAL, substitutions);
-  }
-
-  private void doFailingTest(String commandFilename) throws Exception {
-    runTest(commandFilename, UserPrivileges.NORMAL, ImmutableMap.of());
-  }
-
-  /** 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,
-            clock.nowUtc(),
-            DateTime.parse("1999-04-03T22:00:00.0Z"),
-            REGISTRATION_EXPIRATION_TIME);
-    subordinateHost =
-        persistResource(
-            new Host.Builder()
-                .setRepoId("2-".concat(Ascii.toUpperCase(tld)))
-                .setHostName("ns1." + label + "." + tld)
-                .setPersistedCurrentSponsorRegistrarId("TheRegistrar")
-                .setCreationRegistrarId("TheRegistrar")
-                .setCreationTimeForTest(DateTime.parse("1999-04-03T22:00:00.0Z"))
-                .setSuperordinateDomain(domain.createVKey())
-                .build());
-    domain =
-        persistResource(
-            domain.asBuilder().addSubordinateHost(subordinateHost.getHostName()).build());
-    historyEntryDomainCreate =
-        getOnlyHistoryEntryOfType(domain, DOMAIN_CREATE, DomainHistory.class);
-  }
-
-  private void assertPollMessagesEmitted(
-      DateTime expectedExpirationTime, DateTime implicitTransferTime) {
-    // Assert that there exists a poll message to notify the losing registrar that a transfer was
-    // requested. If the implicit transfer time is now (i.e. the automatic transfer length is zero)
-    // then also expect a server approved poll message.
-    assertThat(getPollMessages("TheRegistrar", clock.nowUtc()))
-        .hasSize(implicitTransferTime.equals(clock.nowUtc()) ? 2 : 1);
-
-    // Two poll messages on the gaining registrar's side at the expected expiration time: a
-    // (OneTime) transfer approved message, and an Autorenew poll message.
-    assertThat(getPollMessages("NewRegistrar", expectedExpirationTime)).hasSize(2);
-    PollMessage transferApprovedPollMessage =
-        getOnlyPollMessage("NewRegistrar", implicitTransferTime, PollMessage.OneTime.class);
-    PollMessage autorenewPollMessage =
-        getOnlyPollMessage("NewRegistrar", expectedExpirationTime, PollMessage.Autorenew.class);
-    assertThat(transferApprovedPollMessage.getEventTime()).isEqualTo(implicitTransferTime);
-    assertThat(autorenewPollMessage.getEventTime()).isEqualTo(expectedExpirationTime);
-    assertThat(
-            transferApprovedPollMessage.getResponseData().stream()
-                .filter(TransferResponse.class::isInstance)
-                .map(TransferResponse.class::cast)
-                .collect(onlyElement())
-                .getTransferStatus())
-        .isEqualTo(TransferStatus.SERVER_APPROVED);
-    PendingActionNotificationResponse panData =
-        transferApprovedPollMessage.getResponseData().stream()
-            .filter(PendingActionNotificationResponse.class::isInstance)
-            .map(PendingActionNotificationResponse.class::cast)
-            .collect(onlyElement());
-    assertThat(panData.getTrid().getClientTransactionId()).hasValue("ABC-12345");
-    assertThat(panData.getActionResult()).isTrue();
-
-    // Two poll messages on the losing registrar's side at the implicit transfer time: a
-    // transfer pending message, and a transfer approved message (both OneTime messages).
-    assertThat(getPollMessages("TheRegistrar", implicitTransferTime)).hasSize(2);
-    PollMessage losingTransferPendingPollMessage =
-        getPollMessages("TheRegistrar", clock.nowUtc()).stream()
-            .filter(pollMessage -> TransferStatus.PENDING.getMessage().equals(pollMessage.getMsg()))
-            .collect(onlyElement());
-    PollMessage losingTransferApprovedPollMessage =
-        getPollMessages("TheRegistrar", implicitTransferTime).stream()
-            .filter(Predicates.not(Predicates.equalTo(losingTransferPendingPollMessage)))
-            .collect(onlyElement());
-    assertThat(losingTransferPendingPollMessage.getEventTime()).isEqualTo(clock.nowUtc());
-    assertThat(losingTransferApprovedPollMessage.getEventTime()).isEqualTo(implicitTransferTime);
-    assertThat(
-            losingTransferPendingPollMessage.getResponseData().stream()
-                .filter(TransferResponse.class::isInstance)
-                .map(TransferResponse.class::cast)
-                .collect(onlyElement())
-                .getTransferStatus())
-        .isEqualTo(TransferStatus.PENDING);
-    assertThat(
-            losingTransferApprovedPollMessage.getResponseData().stream()
-                .filter(TransferResponse.class::isInstance)
-                .map(TransferResponse.class::cast)
-                .collect(onlyElement())
-                .getTransferStatus())
-        .isEqualTo(TransferStatus.SERVER_APPROVED);
-
-    // Assert that the poll messages show up in the TransferData server approve entities.
-    assertPollMessagesEqual(
-        loadByKey(domain.getTransferData().getServerApproveAutorenewPollMessage()),
-        autorenewPollMessage);
-    // Assert that the full set of server-approve poll messages is exactly the server approve
-    // OneTime messages to gaining and losing registrars plus the gaining client autorenew.
-    assertPollMessagesEqual(
-        Iterables.filter(
-            loadByKeys(domain.getTransferData().getServerApproveEntities()), PollMessage.class),
-        ImmutableList.of(
-            transferApprovedPollMessage, losingTransferApprovedPollMessage, autorenewPollMessage));
-  }
-
-  private void assertHistoryEntriesContainBillingEventsAndGracePeriods(
-      DateTime expectedExpirationTime,
-      DateTime implicitTransferTime,
-      Optional<Money> transferCost,
-      ImmutableSet<GracePeriod> originalGracePeriods,
-      boolean expectTransferBillingEvent,
-      BillingCancellation.Builder... extraExpectedBillingEvents) {
-    Tld registry = Tld.get(domain.getTld());
-    final DomainHistory historyEntryTransferRequest =
-        getOnlyHistoryEntryOfType(domain, DOMAIN_TRANSFER_REQUEST, DomainHistory.class);
-
-    // Construct the billing events we expect to exist, starting with the (optional) billing
-    // event for the transfer itself.
-    Optional<BillingEvent> optionalTransferBillingEvent;
-    if (expectTransferBillingEvent) {
-      // For normal transfers, a BillingEvent should be created AUTOMATIC_TRANSFER_DAYS in the
-      // future, for the case when the transfer is implicitly acked.
-      optionalTransferBillingEvent =
-          Optional.of(
-              new BillingEvent.Builder()
-                  .setReason(Reason.TRANSFER)
-                  .setTargetId(domain.getDomainName())
-                  .setEventTime(implicitTransferTime)
-                  .setBillingTime(
-                      implicitTransferTime.plus(registry.getTransferGracePeriodLength()))
-                  .setRegistrarId("NewRegistrar")
-                  .setCost(transferCost.orElse(Money.of(USD, 11)))
-                  .setPeriodYears(1)
-                  .setDomainHistory(historyEntryTransferRequest)
-                  .build());
-    } else {
-      // Superuser transfers with no bundled renewal have no transfer billing event.
-      optionalTransferBillingEvent = Optional.empty();
-    }
-    // Construct the autorenew events for the losing/existing client and the gaining one. Note that
-    // all of the other transfer flow tests happen on day 3 of the transfer, but the initial
-    // request by definition takes place on day 1, so we need to edit the times in the
-    // autorenew events from the base test case.
-    BillingRecurrence losingClientAutorenew =
-        getLosingClientAutorenewEvent()
-            .asBuilder()
-            .setRecurrenceEndTime(implicitTransferTime)
-            .build();
-    BillingRecurrence gainingClientAutorenew =
-        getGainingClientAutorenewEvent()
-            .asBuilder()
-            .setEventTime(expectedExpirationTime)
-            .setRecurrenceLastExpansion(expectedExpirationTime.minusYears(1))
-            .build();
-    // Construct extra billing events expected by the specific test.
-    ImmutableSet<BillingBase> extraBillingBases =
-        Stream.of(extraExpectedBillingEvents)
-            .map(builder -> builder.setDomainHistory(historyEntryTransferRequest).build())
-            .collect(toImmutableSet());
-    // Assert that the billing events we constructed above actually exist in the database.
-    ImmutableSet<BillingBase> expectedBillingBases =
-        Streams.concat(
-                Stream.of(losingClientAutorenew, gainingClientAutorenew),
-                optionalTransferBillingEvent.stream())
-            .collect(toImmutableSet());
-    assertBillingEvents(Sets.union(expectedBillingBases, extraBillingBases));
-    // Assert that the domain's TransferData server-approve billing events match the above.
-    if (expectTransferBillingEvent) {
-      assertBillingEventsEqual(
-          loadByKey(domain.getTransferData().getServerApproveBillingEvent()),
-          optionalTransferBillingEvent.get());
-    } else {
-      assertThat(domain.getTransferData().getServerApproveBillingEvent()).isNull();
-    }
-    assertBillingEventsEqual(
-        loadByKey(domain.getTransferData().getServerApproveAutorenewEvent()),
-        gainingClientAutorenew);
-    // Assert that the full set of server-approve billing events is exactly the extra ones plus
-    // the transfer billing event (if present) and the gaining client autorenew.
-    ImmutableSet<BillingBase> expectedServeApproveBillingBases =
-        Streams.concat(Stream.of(gainingClientAutorenew), optionalTransferBillingEvent.stream())
-            .collect(toImmutableSet());
-    assertBillingEventsEqual(
-        Iterables.filter(
-            loadByKeys(domain.getTransferData().getServerApproveEntities()), BillingBase.class),
-        Sets.union(expectedServeApproveBillingBases, extraBillingBases));
-    // The domain's autorenew billing event should still point to the losing client's event.
-    BillingRecurrence domainAutorenewEvent = loadByKey(domain.getAutorenewBillingEvent());
-    assertThat(domainAutorenewEvent.getRegistrarId()).isEqualTo("TheRegistrar");
-    assertThat(domainAutorenewEvent.getRecurrenceEndTime()).isEqualTo(implicitTransferTime);
-    // The original grace periods should remain untouched.
-    assertThat(domain.getGracePeriods()).containsExactlyElementsIn(originalGracePeriods);
-    // If we fast forward AUTOMATIC_TRANSFER_DAYS, the transfer should have cleared out all other
-    // grace periods, but expect a transfer grace period (if there was a transfer billing event).
-    Domain domainAfterAutomaticTransfer = domain.cloneProjectedAtTime(implicitTransferTime);
-    if (expectTransferBillingEvent) {
-      assertGracePeriods(
-          domainAfterAutomaticTransfer.getGracePeriods(),
-          ImmutableMap.of(
-              GracePeriod.create(
-                  GracePeriodStatus.TRANSFER,
-                  domain.getRepoId(),
-                  implicitTransferTime.plus(registry.getTransferGracePeriodLength()),
-                  "NewRegistrar",
-                  null),
-              optionalTransferBillingEvent.get()));
-    } else {
-      assertGracePeriods(domainAfterAutomaticTransfer.getGracePeriods(), ImmutableMap.of());
-    }
-  }
-
-  private BillingRecurrence getGainingClientAutorenewEvent() {
-    return new BillingRecurrence.Builder()
-        .setReason(Reason.RENEW)
-        .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
-        .setTargetId(domain.getDomainName())
-        .setRegistrarId("NewRegistrar")
-        .setEventTime(EXTENDED_REGISTRATION_EXPIRATION_TIME)
-        .setRecurrenceEndTime(END_OF_TIME)
-        .setDomainHistory(
-            getOnlyHistoryEntryOfType(
-                domain, HistoryEntry.Type.DOMAIN_TRANSFER_REQUEST, DomainHistory.class))
-        .build();
-  }
-
-  /** Get the autorenew event that the losing client will have after a SERVER_APPROVED transfer. */
-  private BillingRecurrence getLosingClientAutorenewEvent() {
-    return new BillingRecurrence.Builder()
-        .setReason(Reason.RENEW)
-        .setFlags(ImmutableSet.of(Flag.AUTO_RENEW))
-        .setTargetId(domain.getDomainName())
-        .setRegistrarId("TheRegistrar")
-        .setEventTime(REGISTRATION_EXPIRATION_TIME)
-        .setRecurrenceEndTime(TRANSFER_EXPIRATION_TIME)
-        .setDomainHistory(historyEntryDomainCreate)
-        .build();
-  }
-
-  private void assertAboutDomainAfterAutomaticTransfer(
-      DateTime expectedExpirationTime, DateTime implicitTransferTime, Period expectedPeriod)
-      throws Exception {
-    Tld registry = Tld.get(domain.getTld());
-    Domain domainAfterAutomaticTransfer = domain.cloneProjectedAtTime(implicitTransferTime);
-    assertTransferApproved(domainAfterAutomaticTransfer, implicitTransferTime, expectedPeriod);
-    assertAboutDomains()
-        .that(domainAfterAutomaticTransfer)
-        .hasRegistrationExpirationTime(expectedExpirationTime)
-        .and()
-        .hasLastEppUpdateTime(implicitTransferTime)
-        .and()
-        .hasLastEppUpdateRegistrarId("NewRegistrar");
-    assertThat(loadByKey(domainAfterAutomaticTransfer.getAutorenewBillingEvent()).getEventTime())
-        .isEqualTo(expectedExpirationTime);
-    // And after the expected grace time, the grace period should be gone.
-    Domain afterGracePeriod =
-        domain.cloneProjectedAtTime(
-            clock
-                .nowUtc()
-                .plus(registry.getAutomaticTransferLength())
-                .plus(registry.getTransferGracePeriodLength()));
-    assertThat(afterGracePeriod.getGracePeriods()).isEmpty();
-  }
-
-  private void assertTransferApproved(
-      Domain domain, DateTime automaticTransferTime, Period expectedPeriod) throws Exception {
-    assertAboutDomains()
-        .that(domain)
-        .hasCurrentSponsorRegistrarId("NewRegistrar")
-        .and()
-        .hasLastTransferTime(automaticTransferTime)
-        .and()
-        .doesNotHaveStatusValue(StatusValue.PENDING_TRANSFER);
-    Trid expectedTrid =
-        Trid.create(
-            getClientTrid(),
-            domain.getTransferData().getTransferRequestTrid().getServerTransactionId());
-    assertThat(domain.getTransferData())
-        .isEqualTo(
-            new DomainTransferData.Builder()
-                .setGainingRegistrarId("NewRegistrar")
-                .setLosingRegistrarId("TheRegistrar")
-                .setTransferRequestTrid(expectedTrid)
-                .setTransferRequestTime(clock.nowUtc())
-                .setTransferPeriod(expectedPeriod)
-                .setTransferStatus(TransferStatus.SERVER_APPROVED)
-                .setPendingTransferExpirationTime(automaticTransferTime)
-                .setTransferredRegistrationExpirationTime(domain.getRegistrationExpirationTime())
-                // Server-approve entity fields should all be nulled out.
-                .build());
-  }
-
-  private void assertTransferRequested(
-      Domain domain,
-      DateTime automaticTransferTime,
-      Period expectedPeriod,
-      DateTime expectedExpirationTime)
-      throws Exception {
-    assertAboutDomains()
-        .that(domain)
-        .hasCurrentSponsorRegistrarId("TheRegistrar")
-        .and()
-        .hasStatusValue(StatusValue.PENDING_TRANSFER)
-        .and()
-        .hasLastEppUpdateTime(clock.nowUtc())
-        .and()
-        .hasLastEppUpdateRegistrarId("NewRegistrar");
-    Trid expectedTrid =
-        Trid.create(
-            getClientTrid(),
-            domain.getTransferData().getTransferRequestTrid().getServerTransactionId());
-    assertThat(domain.getTransferData())
-        .isEqualTo(
-            // Compare against only the following fields by rebuilding the existing TransferData.
-            // Equivalent to assertThat(transferData.getGainingClientId()).isEqualTo("NewReg")
-            // and similar individual assertions, but produces a nicer error message this way.
-            domain
-                .getTransferData()
-                .asBuilder()
-                .setGainingRegistrarId("NewRegistrar")
-                .setLosingRegistrarId("TheRegistrar")
-                .setTransferRequestTrid(expectedTrid)
-                .setTransferRequestTime(clock.nowUtc())
-                .setTransferPeriod(expectedPeriod)
-                .setTransferStatus(TransferStatus.PENDING)
-                .setPendingTransferExpirationTime(automaticTransferTime)
-                .setTransferredRegistrationExpirationTime(expectedExpirationTime)
-                // Don't compare the server-approve entity fields; they're hard to reconstruct
-                // and logic later will check them.
-                .build());
-  }
-}

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

@@ -147,6 +147,24 @@ class DomainTransferRequestFlowTest
           .put("AMOUNT", "11.00")
           .put("CURRENCY", "USD")
           .build();
+  private static final ImmutableMap<String, String> FEE_06_MAP =
+      new ImmutableMap.Builder<String, String>()
+          .putAll(BASE_FEE_MAP)
+          .put("FEE_VERSION", "fee-0.6")
+          .put("FEE_NS", "fee")
+          .build();
+  private static final ImmutableMap<String, String> FEE_11_MAP =
+      new ImmutableMap.Builder<String, String>()
+          .putAll(BASE_FEE_MAP)
+          .put("FEE_VERSION", "fee-0.11")
+          .put("FEE_NS", "fee11")
+          .build();
+  private static final ImmutableMap<String, String> FEE_12_MAP =
+      new ImmutableMap.Builder<String, String>()
+          .putAll(BASE_FEE_MAP)
+          .put("FEE_VERSION", "fee-0.12")
+          .put("FEE_NS", "fee12")
+          .build();
   private static final ImmutableMap<String, String> FEE_STD_1_0_MAP =
       updateSubstitutions(BASE_FEE_MAP, "FEE_VERSION", "epp:fee-1.0", "FEE_NS", "fee1_00");
   private static final ImmutableMap<String, String> RICH_DOMAIN_MAP =
@@ -1826,4 +1844,250 @@ class DomainTransferRequestFlowTest
         assertThrows(AlreadyRedeemedAllocationTokenException.class, this::runFlow);
     assertAboutEppExceptions().that(thrown).marshalsToXml();
   }
+
+  @Test
+  void testFailure_wrongFeeAmount_v06() {
+    setupDomain("example", "tld");
+    runWrongFeeAmountTest(FEE_06_MAP);
+  }
+
+  @Test
+  void testFailure_wrongFeeAmount_v11() {
+    setupDomain("example", "tld");
+    runWrongFeeAmountTest(FEE_11_MAP);
+  }
+
+  @Test
+  void testFailure_wrongFeeAmount_v12() {
+    setupDomain("example", "tld");
+    runWrongFeeAmountTest(FEE_12_MAP);
+  }
+
+  @Test
+  void testFailure_appliedFee_v06() {
+    setupDomain("example", "tld");
+    EppException thrown =
+        assertThrows(
+            UnsupportedFeeAttributeException.class,
+            () -> doFailingTest("domain_transfer_request_fee_applied.xml", FEE_06_MAP));
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_appliedFee_v11() {
+    setupDomain("example", "tld");
+    EppException thrown =
+        assertThrows(
+            UnsupportedFeeAttributeException.class,
+            () -> doFailingTest("domain_transfer_request_fee_applied.xml", FEE_11_MAP));
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_appliedFee_v12() {
+    setupDomain("example", "tld");
+    EppException thrown =
+        assertThrows(
+            UnsupportedFeeAttributeException.class,
+            () -> doFailingTest("domain_transfer_request_fee_applied.xml", FEE_12_MAP));
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_gracePeriodFee_v06() {
+    setupDomain("example", "tld");
+    EppException thrown =
+        assertThrows(
+            UnsupportedFeeAttributeException.class,
+            () -> doFailingTest("domain_transfer_request_fee_grace_period.xml", FEE_06_MAP));
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_gracePeriodFee_v11() {
+    setupDomain("example", "tld");
+    EppException thrown =
+        assertThrows(
+            UnsupportedFeeAttributeException.class,
+            () -> doFailingTest("domain_transfer_request_fee_grace_period.xml", FEE_11_MAP));
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_gracePeriodFee_v12() {
+    setupDomain("example", "tld");
+    EppException thrown =
+        assertThrows(
+            UnsupportedFeeAttributeException.class,
+            () -> doFailingTest("domain_transfer_request_fee_grace_period.xml", FEE_12_MAP));
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_fee_withDefaultAttributes_v06() throws Exception {
+    setupDomain("example", "tld");
+    doSuccessfulTest(
+        "domain_transfer_request_fee_defaults.xml",
+        "domain_transfer_request_response_fee.xml",
+        FEE_06_MAP);
+  }
+
+  @Test
+  void testSuccess_fee_withDefaultAttributes_v11() throws Exception {
+    setupDomain("example", "tld");
+    doSuccessfulTest(
+        "domain_transfer_request_fee_defaults.xml",
+        "domain_transfer_request_response_fee.xml",
+        FEE_11_MAP);
+  }
+
+  @Test
+  void testSuccess_fee_withDefaultAttributes_v12() throws Exception {
+    setupDomain("example", "tld");
+    doSuccessfulTest(
+        "domain_transfer_request_fee_defaults.xml",
+        "domain_transfer_request_response_fee.xml",
+        FEE_12_MAP);
+  }
+
+  @Test
+  void testFailure_refundableFee_v06() {
+    setupDomain("example", "tld");
+    EppException thrown =
+        assertThrows(
+            UnsupportedFeeAttributeException.class,
+            () -> doFailingTest("domain_transfer_request_fee_refundable.xml", FEE_06_MAP));
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_refundableFee_v11() {
+    setupDomain("example", "tld");
+    EppException thrown =
+        assertThrows(
+            UnsupportedFeeAttributeException.class,
+            () -> doFailingTest("domain_transfer_request_fee_refundable.xml", FEE_11_MAP));
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_refundableFee_v12() {
+    setupDomain("example", "tld");
+    EppException thrown =
+        assertThrows(
+            UnsupportedFeeAttributeException.class,
+            () -> doFailingTest("domain_transfer_request_fee_refundable.xml", FEE_12_MAP));
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_wrongCurrency_v06() {
+    runWrongCurrencyTest(FEE_06_MAP);
+  }
+
+  @Test
+  void testFailure_wrongCurrency_v11() {
+    runWrongCurrencyTest(FEE_11_MAP);
+  }
+
+  @Test
+  void testFailure_wrongCurrency_v12() {
+    runWrongCurrencyTest(FEE_12_MAP);
+  }
+
+  @Test
+  void testFailure_feeGivenInWrongScale_v06() {
+    setupDomain("example", "tld");
+    EppException thrown =
+        assertThrows(
+            CurrencyValueScaleException.class,
+            () -> doFailingTest("domain_transfer_request_fee_bad_scale.xml", FEE_06_MAP));
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_feeGivenInWrongScale_v11() {
+    setupDomain("example", "tld");
+    EppException thrown =
+        assertThrows(
+            CurrencyValueScaleException.class,
+            () -> doFailingTest("domain_transfer_request_fee_bad_scale.xml", FEE_11_MAP));
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_feeGivenInWrongScale_v12() {
+    setupDomain("example", "tld");
+    EppException thrown =
+        assertThrows(
+            CurrencyValueScaleException.class,
+            () -> doFailingTest("domain_transfer_request_fee_bad_scale.xml", FEE_12_MAP));
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testSuccess_fee_v06() throws Exception {
+    setupDomain("example", "tld");
+    doSuccessfulTest(
+        "domain_transfer_request_fee.xml", "domain_transfer_request_response_fee.xml", FEE_06_MAP);
+  }
+
+  @Test
+  void testSuccess_fee_v11() throws Exception {
+    setupDomain("example", "tld");
+    doSuccessfulTest(
+        "domain_transfer_request_fee.xml", "domain_transfer_request_response_fee.xml", FEE_11_MAP);
+  }
+
+  @Test
+  void testSuccess_fee_v12() throws Exception {
+    setupDomain("example", "tld");
+    doSuccessfulTest(
+        "domain_transfer_request_fee.xml", "domain_transfer_request_response_fee.xml", FEE_12_MAP);
+  }
+
+  @Test
+  void testSuccess_customLogicFee_v06() throws Exception {
+    setupDomain("expensive-domain", "foo");
+    clock.advanceOneMilli();
+    doSuccessfulTest(
+        "domain_transfer_request_separate_fees.xml",
+        "domain_transfer_request_response_fees.xml",
+        domain.getRegistrationExpirationTime().plusYears(1),
+        new ImmutableMap.Builder<String, String>()
+            .put("DOMAIN", "expensive-domain.foo")
+            .put("YEARS", "1")
+            .put("AMOUNT", "111.00")
+            .put("EXDATE", "2002-09-08T22:00:00.0Z")
+            .put("FEE_VERSION", "fee-0.6")
+            .put("FEE_NS", "fee")
+            .build(),
+        Optional.of(Money.of(USD, 111)));
+  }
+
+  @Test
+  void testSuccess_premiumNotBlocked_v12() throws Exception {
+    setupDomain("rich", "example");
+    clock.advanceOneMilli();
+    // We don't verify the results; just check that the flow doesn't fail.
+    runTest("domain_transfer_request_fee.xml", UserPrivileges.NORMAL, RICH_DOMAIN_MAP);
+  }
+
+  @Test
+  void testFailure_superuserExtension_zeroPeriod_feeTransferExtension_v12() {
+    setupDomain("example", "tld");
+    eppRequestSource = EppRequestSource.TOOL;
+    clock.advanceOneMilli();
+    assertThrows(
+        TransferPeriodZeroAndFeeTransferExtensionException.class,
+        () ->
+            runTest(
+                "domain_transfer_request_fee_and_superuser_extension.xml",
+                UserPrivileges.SUPERUSER,
+                new ImmutableMap.Builder<String, String>()
+                    .putAll(FEE_12_MAP)
+                    .put("PERIOD", "0")
+                    .put("AUTOMATIC_TRANSFER_LENGTH", "5")
+                    .build()));
+  }
 }

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

@@ -14,43 +14,62 @@
 
 package google.registry.flows.domain;
 
-import google.registry.flows.Flow;
-import google.registry.flows.ResourceFlowTestCase;
-import google.registry.model.domain.Domain;
-import google.registry.model.eppcommon.EppXmlTransformer;
+import static com.google.common.truth.Truth.assertThat;
+
 import google.registry.model.eppcommon.ProtocolDefinition;
 import google.registry.util.RegistryEnvironment;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-/**
- * Abstract class for tests that require old versions of the fee extension (0.6, 0.11, 0.12).
- *
- * <p>These are enabled only in the production environment so in order to test them, we need to
- * simulate the production environment for each test (and reset it to the test environment
- * afterward).
- */
-public abstract class ProductionSimulatingFeeExtensionsTest<F extends Flow>
-    extends ResourceFlowTestCase<F, Domain> {
+/** Class for testing the XML extension definitions loaded in the prod environment. */
+public class ProductionSimulatingFeeExtensionsTest {
 
   private RegistryEnvironment previousEnvironment;
 
   @BeforeEach
   void beforeEach() {
     previousEnvironment = RegistryEnvironment.get();
-    RegistryEnvironment.PRODUCTION.setup();
-    reloadServiceExtensionUris();
   }
 
   @AfterEach
   void afterEach() {
     previousEnvironment.setup();
-    reloadServiceExtensionUris();
+    ProtocolDefinition.reloadServiceExtensionUris();
   }
 
-  void reloadServiceExtensionUris() {
+  @Test
+  void testNonProdEnvironments() {
+    for (RegistryEnvironment env : RegistryEnvironment.values()) {
+      if (env.equals(RegistryEnvironment.PRODUCTION)) {
+        continue;
+      }
+      env.setup();
+      ProtocolDefinition.reloadServiceExtensionUris();
+      assertThat(ProtocolDefinition.getVisibleServiceExtensionUris())
+          .containsExactly(
+              "urn:ietf:params:xml:ns:launch-1.0",
+              "urn:ietf:params:xml:ns:rgp-1.0",
+              "urn:ietf:params:xml:ns:secDNS-1.1",
+              "urn:ietf:params:xml:ns:fee-0.6",
+              "urn:ietf:params:xml:ns:fee-0.11",
+              "urn:ietf:params:xml:ns:fee-0.12",
+              "urn:ietf:params:xml:ns:epp:fee-1.0");
+    }
+  }
+
+  @Test
+  void testProdEnvironment() {
+    RegistryEnvironment.PRODUCTION.setup();
     ProtocolDefinition.reloadServiceExtensionUris();
-    sessionMetadata.setServiceExtensionUris(ProtocolDefinition.getVisibleServiceExtensionUris());
-    EppXmlTransformer.reloadTransformers();
+    // prod shouldn't have the fee extension version 1.0
+    assertThat(ProtocolDefinition.getVisibleServiceExtensionUris())
+        .containsExactly(
+            "urn:ietf:params:xml:ns:launch-1.0",
+            "urn:ietf:params:xml:ns:rgp-1.0",
+            "urn:ietf:params:xml:ns:secDNS-1.1",
+            "urn:ietf:params:xml:ns:fee-0.6",
+            "urn:ietf:params:xml:ns:fee-0.11",
+            "urn:ietf:params:xml:ns:fee-0.12");
   }
 }

core/src/test/java/google/registry/flows/host/HostCreateFlowTest.java

@@ -45,6 +45,7 @@ import google.registry.flows.host.HostFlowUtils.HostNameNotNormalizedException;
 import google.registry.flows.host.HostFlowUtils.HostNameNotPunyCodedException;
 import google.registry.flows.host.HostFlowUtils.HostNameTooLongException;
 import google.registry.flows.host.HostFlowUtils.HostNameTooShallowException;
+import google.registry.flows.host.HostFlowUtils.InvalidHostNameException;
 import google.registry.flows.host.HostFlowUtils.LoopbackIpNotValidForHostException;
 import google.registry.flows.host.HostFlowUtils.SuperordinateDomainDoesNotExistException;
 import google.registry.flows.host.HostFlowUtils.SuperordinateDomainInPendingDeleteException;
@@ -82,9 +83,14 @@ class HostCreateFlowTest extends ResourceFlowTestCase<HostCreateFlow, Host> {
   }
 
   private void doSuccessfulTest() throws Exception {
+    doSuccessfulTest("host_create_response.xml", ImmutableMap.of());
+  }
+
+  private void doSuccessfulTest(String responseFile, ImmutableMap<String, String> substitutions)
+      throws Exception {
     clock.advanceOneMilli();
     assertMutatingFlow(true);
-    runFlowAssertResponse(loadFile("host_create_response.xml"));
+    runFlowAssertResponse(loadFile(responseFile, substitutions));
     Host host = reloadResourceByForeignKey();
     // Check that the host was created and persisted with a history entry.
     assertAboutHosts()
@@ -134,6 +140,28 @@ class HostCreateFlowTest extends ResourceFlowTestCase<HostCreateFlow, Host> {
     assertHostDnsRequests("ns1.example.tld");
   }
 
+  @Test
+  void testSuccess_tldWithHyphenOn3And4() throws Exception {
+    setEppHostCreateInput("ns1.example.zz--main-2262", null);
+    doSuccessfulTest(
+        "host_create_response_wildcard.xml",
+        ImmutableMap.of("HOSTNAME", "ns1.example.zz--main-2262"));
+  }
+
+  @Test
+  void testFailure_domainWithHyphenOn3And4() throws Exception {
+    setEppHostCreateInput("ns1.zz--main-2262.tld", null);
+    EppException thrown = assertThrows(InvalidHostNameException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
+  @Test
+  void testFailure_hostnameWithHyphenOn3And4() throws Exception {
+    setEppHostCreateInput("zz--ns1.domain.tld", null);
+    EppException thrown = assertThrows(InvalidHostNameException.class, this::runFlow);
+    assertAboutEppExceptions().that(thrown).marshalsToXml();
+  }
+
   @Test
   void testFailure_multipartTLDsAndInvalidHost() {
     createTlds("bar.tld", "tld");

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

@@ -68,7 +68,10 @@ 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");
+        .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");
     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/monitoring/whitebox/JvmMetricsTest.java

@@ -0,0 +1,96 @@
+// Copyright 2017 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.monitoring.whitebox;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.monitoring.metrics.MetricRegistry;
+import com.google.monitoring.metrics.MetricRegistryImpl;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryUsage;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/** Unit tests for {@link JvmMetrics}. */
+class JvmMetricsTests {
+
+  private MetricRegistry registry;
+  private JvmMetrics jvmMetrics;
+  private MemoryMXBean mockMemoryMXBean = mock(MemoryMXBean.class);
+
+  private static final MemoryUsage HEAP_USAGE =
+      new MemoryUsage(/*init*/ 100, /*used*/ 200, /*commited*/ 500, /*max*/ 1000);
+  private static final MemoryUsage NON_HEAP_USAGE =
+      new MemoryUsage(/*init*/ 50, /*used*/ 100, /*commited*/ 250, /*max*/ 500);
+
+  @BeforeEach
+  public void setUp() {
+    MetricRegistryImpl.getDefault().unregisterAllMetrics();
+    registry = MetricRegistryImpl.getDefault();
+
+    when(mockMemoryMXBean.getHeapMemoryUsage()).thenReturn(HEAP_USAGE);
+    when(mockMemoryMXBean.getNonHeapMemoryUsage()).thenReturn(NON_HEAP_USAGE);
+
+    jvmMetrics = new JvmMetrics(mockMemoryMXBean);
+  }
+
+  @Test
+  public void metricsRegistered() {
+    jvmMetrics.register();
+
+    assertThat(registry.getRegisteredMetrics()).hasSize(3);
+
+    for (var metric : registry.getRegisteredMetrics()) {
+      assertThat(metric).isInstanceOf(com.google.monitoring.metrics.VirtualMetric.class);
+    }
+  }
+
+  @Test
+  public void testGetUsedMemory() {
+    jvmMetrics.register();
+    ImmutableMap<ImmutableList<String>, Long> values = jvmMetrics.getUsedMemory();
+
+    assertThat(values)
+        .containsExactly(
+            ImmutableList.of("heap"), 200L,
+            ImmutableList.of("non_heap"), 100L);
+  }
+
+  @Test
+  public void testGetCommittedMemory() {
+    jvmMetrics.register();
+    ImmutableMap<ImmutableList<String>, Long> values = jvmMetrics.getCommittedMemory();
+
+    assertThat(values)
+        .containsExactly(
+            ImmutableList.of("heap"), 500L,
+            ImmutableList.of("non_heap"), 250L);
+  }
+
+  @Test
+  public void testGetMaxMemory() {
+    jvmMetrics.register();
+    ImmutableMap<ImmutableList<String>, Long> values = jvmMetrics.getMaxMemory();
+
+    assertThat(values)
+        .containsExactly(
+            ImmutableList.of("heap"), 1000L,
+            ImmutableList.of("non_heap"), 500L);
+  }
+}

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

@@ -298,9 +298,13 @@ have failed to comply with these terms.",
     }
 
     JsonFileBuilder addNameserver(String name, String handle) {
+      return addNameserver(Idn.toASCII(name), name, handle);
+    }
+
+    JsonFileBuilder addNameserver(String punycodeName, String unicodeName, String handle) {
       return putNext(
-          "NAMESERVER_NAME_", Idn.toASCII(name),
-          "NAMESERVER_UNICODE_NAME_", name,
+          "NAMESERVER_NAME_", punycodeName,
+          "NAMESERVER_UNICODE_NAME_", unicodeName,
           "NAMESERVER_HANDLE_", handle);
     }
 

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

@@ -17,6 +17,8 @@ package google.registry.rdap;
 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.testing.DatabaseHelper.createTld;
 import static google.registry.testing.DatabaseHelper.persistResource;
+import static google.registry.testing.FullFieldsTestEntityHelper.makeAndPersistHost;
+import static google.registry.testing.FullFieldsTestEntityHelper.makePunycodedHost;
 import static google.registry.testing.FullFieldsTestEntityHelper.makeRegistrar;
 import static google.registry.testing.GsonSubject.assertAboutJson;
 import static org.mockito.Mockito.verify;
@@ -27,7 +29,6 @@ import google.registry.rdap.RdapMetrics.SearchType;
 import google.registry.rdap.RdapMetrics.WildcardType;
 import google.registry.rdap.RdapSearchResults.IncompletenessWarningType;
 import google.registry.request.Action;
-import google.registry.testing.FullFieldsTestEntityHelper;
 import java.util.Optional;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -43,20 +44,17 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
   void beforeEach() {
     // normal
     createTld("lol");
-    FullFieldsTestEntityHelper.makeAndPersistHost(
-        "ns1.cat.lol", "1.2.3.4", clock.nowUtc().minusYears(1));
+    makeAndPersistHost("ns1.cat.lol", "1.2.3.4", clock.nowUtc().minusYears(1));
     // idn
     createTld("xn--q9jyb4c");
-    FullFieldsTestEntityHelper.makeAndPersistHost(
+    makeAndPersistHost(
         "ns1.cat.xn--q9jyb4c", "bad:f00d:cafe:0:0:0:15:beef", clock.nowUtc().minusYears(1));
     // multilevel
     createTld("1.tld");
-    FullFieldsTestEntityHelper.makeAndPersistHost(
-        "ns1.domain.1.tld", "5.6.7.8", clock.nowUtc().minusYears(1));
+    makeAndPersistHost("ns1.domain.1.tld", "5.6.7.8", clock.nowUtc().minusYears(1));
     // deleted
     persistResource(
-        FullFieldsTestEntityHelper.makeAndPersistHost(
-                "nsdeleted.cat.lol", "1.2.3.4", clock.nowUtc().minusYears(1))
+        makeAndPersistHost("nsdeleted.cat.lol", "1.2.3.4", clock.nowUtc().minusYears(1))
             .asBuilder()
             .setDeletionTime(clock.nowUtc().minusMonths(1))
             .build());
@@ -64,8 +62,7 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
     persistResource(
         makeRegistrar("otherregistrar", "Yes Virginia <script>", Registrar.State.ACTIVE, 102L));
     // external
-    FullFieldsTestEntityHelper.makeAndPersistHost(
-        "ns1.domain.external", "9.10.11.12", clock.nowUtc().minusYears(1));
+    makeAndPersistHost("ns1.domain.external", "9.10.11.12", clock.nowUtc().minusYears(1));
   }
 
   @Test
@@ -80,6 +77,14 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
     assertThat(response.getStatus()).isEqualTo(400);
   }
 
+  @Test
+  void testInvalidNameserver_domainWithHyphenOn3And4_returns400() {
+    assertAboutJson()
+        .that(generateActualJson("ns1.zz--main-2166.lol"))
+        .isEqualTo(generateExpectedJsonError("Not a valid nameserver", 400));
+    assertThat(response.getStatus()).isEqualTo(400);
+  }
+
   @Test
   void testUnknownNameserver_returns404() {
     assertAboutJson()
@@ -101,6 +106,21 @@ class RdapNameserverActionTest extends RdapActionBaseTestCase<RdapNameserverActi
     assertThat(response.getStatus()).isEqualTo(200);
   }
 
+  @Test
+  void testNameserver_tldTithHyphenOn3And4_works() {
+    createTld("zz--main-2166");
+    persistResource(makePunycodedHost("ns1.cat.zz--main-2166", "1.2.3.4", null, "TheRegistrar"));
+    assertAboutJson()
+        .that(generateActualJson("ns1.cat.zz--main-2166"))
+        .isEqualTo(
+            addPermanentBoilerplateNotices(
+                jsonFileBuilder()
+                    .addNameserver("ns1.cat.zz--main-2166", "ns1.cat.zz--main-2166", "F-ROID")
+                    .putAll("ADDRESSTYPE", "v4", "ADDRESS", "1.2.3.4", "STATUS", "active")
+                    .load("rdap_host.json")));
+    assertThat(response.getStatus()).isEqualTo(200);
+  }
+
   @Test
   void testTrailingDot_getsIgnored() {
     assertAboutJson()

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

@@ -135,10 +135,15 @@ public final class FullFieldsTestEntityHelper {
 
   public static Host makeHost(
       String fqhn, @Nullable String ip1, @Nullable String ip2, String registrarClientId) {
+    return makePunycodedHost(Idn.toASCII(fqhn), ip1, ip2, registrarClientId);
+  }
+
+  public static Host makePunycodedHost(
+      String fqhn, @Nullable String ip1, @Nullable String ip2, String registrarClientId) {
     Host.Builder builder =
         new Host.Builder()
             .setRepoId(generateNewContactHostRoid())
-            .setHostName(Idn.toASCII(fqhn))
+            .setHostName(fqhn)
             .setCreationTimeForTest(DateTime.parse("2000-10-08T00:45:00Z"))
             .setPersistedCurrentSponsorRegistrarId(registrarClientId);
     if ((ip1 != null) || (ip2 != null)) {

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

@@ -31,35 +31,33 @@ class ValidateEscrowDepositCommandTest extends CommandTestCase<ValidateEscrowDep
     assertThat(getStdoutAsString())
         .isEqualTo(
             """
-        ID: 20101017001
-        Previous ID: 20101010001
-        Type: FULL
-        Watermark: 2010-10-17T00:00:00.000Z
-        RDE Version: 1.0
+            ID: 20101017001
+            Previous ID: 20101010001
+            Type: FULL
+            Watermark: 2010-10-17T00:00:00.000Z
+            RDE Version: 1.0
 
-        RDE Object URIs:
-          - urn:ietf:params:xml:ns:rdeContact-1.0
-          - urn:ietf:params:xml:ns:rdeDomain-1.0
-          - urn:ietf:params:xml:ns:rdeEppParams-1.0
-          - urn:ietf:params:xml:ns:rdeHeader-1.0
-          - urn:ietf:params:xml:ns:rdeHost-1.0
-          - urn:ietf:params:xml:ns:rdeIDN-1.0
-          - urn:ietf:params:xml:ns:rdeNNDN-1.0
-          - urn:ietf:params:xml:ns:rdeRegistrar-1.0
+            RDE Object URIs:
+              - urn:ietf:params:xml:ns:rdeDomain-1.0
+              - urn:ietf:params:xml:ns:rdeEppParams-1.0
+              - urn:ietf:params:xml:ns:rdeHeader-1.0
+              - urn:ietf:params:xml:ns:rdeHost-1.0
+              - urn:ietf:params:xml:ns:rdeIDN-1.0
+              - urn:ietf:params:xml:ns:rdeNNDN-1.0
+              - urn:ietf:params:xml:ns:rdeRegistrar-1.0
 
-        Contents:
-          - XjcRdeContact: 1 entry
-          - XjcRdeDomain: 2 entries
-          - XjcRdeEppParams: 1 entry
-          - XjcRdeHeader: 1 entry
-          - XjcRdeHost: 2 entries
-          - XjcRdeIdn: 1 entry
-          - XjcRdeNndn: 1 entry
-          - XjcRdePolicy: 1 entry
-          - XjcRdeRegistrar: 1 entry
+            Contents:
+              - XjcRdeDomain: 2 entries
+              - XjcRdeEppParams: 1 entry
+              - XjcRdeHeader: 1 entry
+              - XjcRdeHost: 2 entries
+              - XjcRdeIdn: 1 entry
+              - XjcRdeNndn: 1 entry
+              - XjcRdePolicy: 1 entry
+              - XjcRdeRegistrar: 1 entry
 
-        RDE deposit is XML schema valid
-        """);
+            RDE deposit is XML schema valid
+            """);
   }
 
   @Test
@@ -69,46 +67,44 @@ class ValidateEscrowDepositCommandTest extends CommandTestCase<ValidateEscrowDep
     assertThat(getStdoutAsString())
         .isEqualTo(
             """
-        ID: 20101017001
-        Previous ID: 20101010001
-        Type: FULL
-        Watermark: 2010-10-17T00:00:00.000Z
-        RDE Version: 1.0
+            ID: 20101017001
+            Previous ID: 20101010001
+            Type: FULL
+            Watermark: 2010-10-17T00:00:00.000Z
+            RDE Version: 1.0
 
-        RDE Object URIs:
-          - urn:ietf:params:xml:ns:rdeContact-1.0
-          - urn:ietf:params:xml:ns:rdeDomain-1.0
-          - urn:ietf:params:xml:ns:rdeEppParams-1.0
-          - urn:ietf:params:xml:ns:rdeHeader-1.0
-          - urn:ietf:params:xml:ns:rdeHost-1.0
-          - urn:ietf:params:xml:ns:rdeIDN-1.0
-          - urn:ietf:params:xml:ns:rdeNNDN-1.0
-          - urn:ietf:params:xml:ns:rdeRegistrar-1.0
+            RDE Object URIs:
+              - urn:ietf:params:xml:ns:rdeDomain-1.0
+              - urn:ietf:params:xml:ns:rdeEppParams-1.0
+              - urn:ietf:params:xml:ns:rdeHeader-1.0
+              - urn:ietf:params:xml:ns:rdeHost-1.0
+              - urn:ietf:params:xml:ns:rdeIDN-1.0
+              - urn:ietf:params:xml:ns:rdeNNDN-1.0
+              - urn:ietf:params:xml:ns:rdeRegistrar-1.0
 
-        Contents:
-          - XjcRdeContact: 1 entry
-          - XjcRdeDomain: 2 entries
-          - XjcRdeEppParams: 1 entry
-          - XjcRdeHeader: 1 entry
-          - XjcRdeHost: 2 entries
-          - XjcRdeIdn: 1 entry
-          - XjcRdeNndn: 1 entry
-          - XjcRdePolicy: 1 entry
-          - XjcRdeRegistrar: 1 entry
+            Contents:
+              - XjcRdeDomain: 2 entries
+              - XjcRdeEppParams: 1 entry
+              - XjcRdeHeader: 1 entry
+              - XjcRdeHost: 2 entries
+              - XjcRdeIdn: 1 entry
+              - XjcRdeNndn: 1 entry
+              - XjcRdePolicy: 1 entry
+              - XjcRdeRegistrar: 1 entry
 
-        Bad host refs: ns1.LAFFO.com
-        RDE deposit is XML schema valid but has bad references
-        """);
+            Bad host refs: ns1.LAFFO.com
+            RDE deposit is XML schema valid but has bad references
+            """);
   }
 
   @Test
-  void testRun_badXml() throws Exception {
+  void testRun_badXml_truncatedFile() throws Exception {
     String file = writeToTmpFile(RdeTestData.loadFile("deposit_full.xml").substring(0, 2000));
     XmlException thrown = assertThrows(XmlException.class, () -> runCommand("--input=" + file));
     assertThat(thrown)
         .hasMessageThat()
         .contains(
-            "Syntax error at line 46, column 38: "
+            "Syntax error at line 49, column 18: "
                 + "XML document structures must start and end within the same entity.");
   }
 }

core/src/test/java/google/registry/xjc/XjcObjectTest.java

@@ -45,7 +45,7 @@ class XjcObjectTest {
     String xml = out.toString(UTF_8.toString());
     Pattern pat = Pattern.compile("^<\\?xml version=\"1\\.0\" encoding=\"UTF[-_]?8\"");
     assertWithMessage("bad xml declaration: " + xml).that(pat.matcher(xml).find()).isTrue();
-    assertWithMessage("encode/decode didn't work: " + xml).that(xml).contains("Jane Doe");
+    assertWithMessage("encode/decode didn't work: " + xml).that(xml).contains("jdoe@example.test");
   }
 
   @Test
@@ -56,7 +56,7 @@ class XjcObjectTest {
     String xml = out.toString(UTF_16.toString());
     Pattern pat = Pattern.compile("^<\\?xml version=\"1\\.0\" encoding=\"UTF[-_]?16\"");
     assertWithMessage(xml).that(pat.matcher(xml).find()).isTrue();
-    assertWithMessage("encode/decode didn't work: " + xml).that(xml).contains("Jane Doe");
+    assertWithMessage("encode/decode didn't work: " + xml).that(xml).contains("jdoe@example.test");
   }
 
   @Test

core/src/test/resources/google/registry/beam/rde/reducer_rde.xml

@@ -3,7 +3,6 @@
     <rde:watermark>2000-01-01T00:00:00Z</rde:watermark>
     <rde:rdeMenu>
         <rde:version>1.0</rde:version>
-        <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
         <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
         <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
         <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
@@ -13,7 +12,6 @@
     <rde:contents>
 <rdeDomain:domain/>
 <rdeRegistrar:registrar/>
-<rdeContact:contact/>
 <rdeHost:host/>
 
 <rdeIDN:idnTableRef id="extended_latin">
@@ -38,7 +36,6 @@
 
 <rdeHeader:header>
     <rdeHeader:tld>soy</rdeHeader:tld>
-    <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeContact-1.0">1</rdeHeader:count>
     <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeDomain-1.0">1</rdeHeader:count>
     <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeHost-1.0">1</rdeHeader:count>
     <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">1</rdeHeader:count>

core/src/test/resources/google/registry/beam/rde/reducer_rde_report.xml

@@ -10,7 +10,6 @@
     <rdeReport:watermark>2000-01-01T00:00:00Z</rdeReport:watermark>
     <rdeHeader:header>
         <rdeHeader:tld>soy</rdeHeader:tld>
-        <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeContact-1.0">1</rdeHeader:count>
         <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeDomain-1.0">1</rdeHeader:count>
         <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeHost-1.0">1</rdeHeader:count>
         <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">1</rdeHeader:count>

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

@@ -6,11 +6,8 @@
       </domain:check>
     </check>
     <extension>
-      <fee:check xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:domain>
-          <fee:name>rich.example</fee:name>
-          <fee:command>transfer</fee:command>
-        </fee:domain>
+      <fee:check xmlns:fee="urn:ietf:params:xml:ns:epp:fee-1.0">
+        <fee:command name="transfer"/>
       </fee:check>
     </extension>
     <clTRID>ABC-12345</clTRID>

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

@@ -0,0 +1,60 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-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="0">rich.example</domain:name>
+          <domain:reason>In use</domain:reason>
+        </domain:cd>
+      </domain:chkData>
+    </resData>
+    <extension>
+      <fee:chkData xmlns:fee="urn:ietf:params:xml:ns:epp:fee-1.0">
+        <fee:currency>USD</fee:currency>
+        <fee:cd>
+          <fee:objID>rich.example</fee:objID>
+          <fee:class>premium</fee:class>
+          <fee:command name="create">
+            <fee:period unit="y">1</fee:period>
+            <fee:fee description="create">100.00</fee:fee>
+          </fee:command>
+        </fee:cd>
+        <fee:cd>
+          <fee:objID>rich.example</fee:objID>
+          <fee:command name="renew">
+            <fee:period unit="y">1</fee:period>
+            <fee:fee description="renew">%RENEWPRICE%</fee:fee>
+          </fee:command>
+        </fee:cd>
+        <fee:cd>
+          <fee:objID>rich.example</fee:objID>
+          <fee:command name="transfer">
+            <fee:period unit="y">1</fee:period>
+            <fee:fee description="renew">%RENEWPRICE%</fee:fee>
+          </fee:command>
+        </fee:cd>
+        <fee:cd>
+          <fee:objID>rich.example</fee:objID>
+          <fee:command name="restore">
+            <fee:period unit="y">1</fee:period>
+            <fee:fee description="restore">17.00</fee:fee>
+          </fee:command>
+        </fee:cd>
+        <fee:cd>
+          <fee:objID>rich.example</fee:objID>
+          <fee:command name="update">
+            <fee:period unit="y">1</fee:period>
+            <fee:fee description="update">0.00</fee:fee>
+          </fee:command>
+        </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/domain_check_fee_response_domain_exists_stdv1_renew_only.xml

@@ -12,13 +12,14 @@
       </domain:chkData>
     </resData>
     <extension>
-      <fee:chkData xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:cd xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-          <fee:name>rich.example</fee:name>
-          <fee:currency>USD</fee:currency>
-          <fee:command>renew</fee:command>
-          <fee:period unit="y">1</fee:period>
-          <fee:fee description="renew">%RENEWPRICE%</fee:fee>
+      <fee:chkData xmlns:fee="urn:ietf:params:xml:ns:epp:fee-1.0">
+        <fee:currency>USD</fee:currency>
+        <fee:cd>
+          <fee:objID>rich.example</fee:objID>
+          <fee:command name="renew">
+            <fee:period unit="y">1</fee:period>
+            <fee:fee description="renew">%RENEWPRICE%</fee:fee>
+          </fee:command>
         </fee:cd>
       </fee:chkData>
     </extension>

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

@@ -12,13 +12,14 @@
       </domain:chkData>
     </resData>
     <extension>
-      <fee:chkData xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:cd xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-          <fee:name>rich.example</fee:name>
-          <fee:currency>USD</fee:currency>
-          <fee:command>transfer</fee:command>
-          <fee:period unit="y">1</fee:period>
-          <fee:fee description="renew">%RENEWPRICE%</fee:fee>
+      <fee:chkData xmlns:fee="urn:ietf:params:xml:ns:epp:fee-1.0">
+        <fee:currency>USD</fee:currency>
+        <fee:cd>
+          <fee:objID>rich.example</fee:objID>
+          <fee:command name="transfer">
+            <fee:period unit="y">1</fee:period>
+            <fee:fee description="renew">%RENEWPRICE%</fee:fee>
+          </fee:command>
         </fee:cd>
       </fee:chkData>
     </extension>

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

@@ -1,52 +0,0 @@
-<epp xmlns="urn:ietf:params:xml:ns:epp-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="0">rich.example</domain:name>
-          <domain:reason>In use</domain:reason>
-        </domain:cd>
-      </domain:chkData>
-    </resData>
-    <extension>
-      <fee:chkData xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-        <fee:cd xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-          <fee:name>rich.example</fee:name>
-          <fee:currency>USD</fee:currency>
-          <fee:command>create</fee:command>
-          <fee:period unit="y">1</fee:period>
-          <fee:fee description="create">100.00</fee:fee>
-          <fee:class>premium</fee:class>
-        </fee:cd>
-        <fee:cd xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-          <fee:name>rich.example</fee:name>
-          <fee:currency>USD</fee:currency>
-          <fee:command>renew</fee:command>
-          <fee:period unit="y">1</fee:period>
-          <fee:fee description="renew">%RENEWPRICE%</fee:fee>
-        </fee:cd>
-        <fee:cd xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-          <fee:name>rich.example</fee:name>
-          <fee:currency>USD</fee:currency>
-          <fee:command>transfer</fee:command>
-          <fee:period unit="y">1</fee:period>
-          <fee:fee description="renew">%RENEWPRICE%</fee:fee>
-        </fee:cd>
-        <fee:cd xmlns:fee="urn:ietf:params:xml:ns:fee-0.6">
-          <fee:name>rich.example</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:chkData>
-    </extension>
-    <trID>
-      <clTRID>ABC-12345</clTRID>
-      <svTRID>server-trid</svTRID>
-    </trID>
-  </response>
-</epp>

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

@@ -6,11 +6,15 @@
       <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>
         <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>
         <extURI>urn:ietf:params:xml:ns:secDNS-1.1</extURI>
+        <extURI>urn:ietf:params:xml:ns:fee-0.6</extURI>
+        <extURI>urn:ietf:params:xml:ns:fee-0.11</extURI>
+        <extURI>urn:ietf:params:xml:ns:fee-0.12</extURI>
         <extURI>urn:ietf:params:xml:ns:epp:fee-1.0</extURI>
       </svcExtension>
     </svcMenu>

core/src/test/resources/google/registry/flows/host/host_create_response_wildcard.xml

@@ -0,0 +1,18 @@
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0">
+  <response>
+    <result code="1000">
+      <msg>Command completed successfully</msg>
+    </result>
+    <resData>
+      <host:creData
+       xmlns:host="urn:ietf:params:xml:ns:host-1.0">
+        <host:name>%HOSTNAME%</host:name>
+        <host:crDate>1999-04-03T22:00:00.0Z</host:crDate>
+      </host:creData>
+    </resData>
+    <trID>
+      <clTRID>ABC-12345</clTRID>
+      <svTRID>server-trid</svTRID>
+    </trID>
+  </response>
+</epp>

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

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

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

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

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

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

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

@@ -6,11 +6,15 @@
       <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>
         <extURI>urn:ietf:params:xml:ns:rgp-1.0</extURI>
         <extURI>urn:ietf:params:xml:ns:secDNS-1.1</extURI>
+        <extURI>urn:ietf:params:xml:ns:fee-0.6</extURI>
+        <extURI>urn:ietf:params:xml:ns:fee-0.11</extURI>
+        <extURI>urn:ietf:params:xml:ns:fee-0.12</extURI>
         <extURI>urn:ietf:params:xml:ns:epp:fee-1.0</extURI>
       </svcExtension>
     </svcMenu>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -10,6 +10,7 @@
       <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/rde/deposit_full.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rde:deposit type="FULL" id="20101017001" prevId="20101010001"
   xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
-  xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
   xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
   xmlns:rde="urn:ietf:params:xml:ns:rde-1.0"
   xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0"
   xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0"
   xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0"
-  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
   xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
   xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0"
   xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -19,7 +17,6 @@
   <rde:rdeMenu>
     <rde:version>1.0</rde:version>
     <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
-    <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
@@ -39,9 +36,6 @@
       <rdeHeader:count
         uri="urn:ietf:params:xml:ns:rdeHost-1.0">1
         </rdeHeader:count>
-      <rdeHeader:count
-        uri="urn:ietf:params:xml:ns:rdeContact-1.0">1
-        </rdeHeader:count>
       <rdeHeader:count
         uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">1
     </rdeHeader:count>
@@ -61,9 +55,6 @@
       <rdeDom:name>example1.test</rdeDom:name>
       <rdeDom:roid>Dexample1-TEST</rdeDom:roid>
       <rdeDom:status s="ok"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
       <rdeDom:ns>
         <domain:hostObj>ns1.example.com</domain:hostObj>
         <domain:hostObj>ns1.example1.test</domain:hostObj>
@@ -80,9 +71,6 @@
       <rdeDom:roid>Dexample2-TEST</rdeDom:roid>
       <rdeDom:status s="ok"/>
       <rdeDom:status s="clientUpdateProhibited"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
       <rdeDom:clID>RegistrarX</rdeDom:clID>
       <rdeDom:crRr>RegistrarX</rdeDom:crRr>
       <rdeDom:crDate>1999-04-03T22:00:00.0Z</rdeDom:crDate>
@@ -123,44 +111,6 @@
       <rdeHost:upDate>2009-10-03T09:34:00.0Z</rdeHost:upDate>
     </rdeHost:host>
 
-    <!-- Contact: sh8013 -->
-    <rdeContact:contact>
-      <rdeContact:id>sh8013</rdeContact:id>
-      <rdeContact:roid>Csh8013-TEST</rdeContact:roid>
-      <rdeContact:status s="linked"/>
-      <rdeContact:status s="clientDeleteProhibited"/>
-      <rdeContact:postalInfo type="int">
-        <contact:name>John Doe</contact:name>
-        <contact:org>Example Inc.</contact:org>
-        <contact:addr>
-          <contact:street>123 Example Dr.</contact:street>
-          <contact:street>Suite 100</contact:street>
-          <contact:city>Dulles</contact:city>
-          <contact:sp>VA</contact:sp>
-          <contact:pc>20166-6503</contact:pc>
-          <contact:cc>US</contact:cc>
-        </contact:addr>
-      </rdeContact:postalInfo>
-      <rdeContact:voice x="1234">+1.7035555555
-      </rdeContact:voice>
-      <rdeContact:fax>+1.7035555556
-      </rdeContact:fax>
-      <rdeContact:email>jdoe@example.test
-      </rdeContact:email>
-      <rdeContact:clID>RegistrarX</rdeContact:clID>
-      <rdeContact:crRr client="jdoe">RegistrarX
-      </rdeContact:crRr>
-      <rdeContact:crDate>2009-09-13T08:01:00.0Z</rdeContact:crDate>
-      <rdeContact:upRr client="jdoe">RegistrarX
-      </rdeContact:upRr>
-      <rdeContact:upDate>2009-11-26T09:10:00.0Z</rdeContact:upDate>
-      <rdeContact:trDate>2009-12-03T09:05:00.0Z</rdeContact:trDate>
-      <rdeContact:disclose flag="0">
-        <contact:voice/>
-        <contact:email/>
-      </rdeContact:disclose>
-    </rdeContact:contact>
-
     <!-- Registrar: RegistrarX -->
     <rdeRegistrar:registrar>
       <rdeRegistrar:id>RegistrarX</rdeRegistrar:id>
@@ -223,9 +173,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html
       <rdeEppParams:objURI>
         urn:ietf:params:xml:ns:domain-1.0
       </rdeEppParams:objURI>
-      <rdeEppParams:objURI>
-        urn:ietf:params:xml:ns:contact-1.0
-      </rdeEppParams:objURI>
       <rdeEppParams:objURI>
         urn:ietf:params:xml:ns:host-1.0
       </rdeEppParams:objURI>

core/src/test/resources/google/registry/rde/deposit_full_badref.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rde:deposit type="FULL" id="20101017001" prevId="20101010001"
   xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
-  xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
   xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
   xmlns:rde="urn:ietf:params:xml:ns:rde-1.0"
   xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0"
   xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0"
   xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0"
-  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
   xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
   xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0"
   xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -19,7 +17,6 @@
   <rde:rdeMenu>
     <rde:version>1.0</rde:version>
     <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
-    <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
@@ -39,9 +36,6 @@
       <rdeHeader:count
         uri="urn:ietf:params:xml:ns:rdeHost-1.0">1
         </rdeHeader:count>
-      <rdeHeader:count
-        uri="urn:ietf:params:xml:ns:rdeContact-1.0">1
-        </rdeHeader:count>
       <rdeHeader:count
         uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">1
     </rdeHeader:count>
@@ -61,9 +55,6 @@
       <rdeDom:name>example1.test</rdeDom:name>
       <rdeDom:roid>Dexample1-TEST</rdeDom:roid>
       <rdeDom:status s="ok"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
       <rdeDom:ns>
         <domain:hostObj>ns1.LAFFO.com</domain:hostObj>
         <domain:hostObj>ns1.example1.test</domain:hostObj>
@@ -80,9 +71,6 @@
       <rdeDom:roid>Dexample2-TEST</rdeDom:roid>
       <rdeDom:status s="ok"/>
       <rdeDom:status s="clientUpdateProhibited"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
       <rdeDom:clID>RegistrarX</rdeDom:clID>
       <rdeDom:crRr>RegistrarX</rdeDom:crRr>
       <rdeDom:crDate>1999-04-03T22:00:00.0Z</rdeDom:crDate>
@@ -123,44 +111,6 @@
       <rdeHost:upDate>2009-10-03T09:34:00.0Z</rdeHost:upDate>
     </rdeHost:host>
 
-    <!-- Contact: sh8013 -->
-    <rdeContact:contact>
-      <rdeContact:id>sh8013</rdeContact:id>
-      <rdeContact:roid>Csh8013-TEST</rdeContact:roid>
-      <rdeContact:status s="linked"/>
-      <rdeContact:status s="clientDeleteProhibited"/>
-      <rdeContact:postalInfo type="int">
-        <contact:name>John Doe</contact:name>
-        <contact:org>Example Inc.</contact:org>
-        <contact:addr>
-          <contact:street>123 Example Dr.</contact:street>
-          <contact:street>Suite 100</contact:street>
-          <contact:city>Dulles</contact:city>
-          <contact:sp>VA</contact:sp>
-          <contact:pc>20166-6503</contact:pc>
-          <contact:cc>US</contact:cc>
-        </contact:addr>
-      </rdeContact:postalInfo>
-      <rdeContact:voice x="1234">+1.7035555555
-      </rdeContact:voice>
-      <rdeContact:fax>+1.7035555556
-      </rdeContact:fax>
-      <rdeContact:email>jdoe@example.test
-      </rdeContact:email>
-      <rdeContact:clID>RegistrarX</rdeContact:clID>
-      <rdeContact:crRr client="jdoe">RegistrarX
-      </rdeContact:crRr>
-      <rdeContact:crDate>2009-09-13T08:01:00.0Z</rdeContact:crDate>
-      <rdeContact:upRr client="jdoe">RegistrarX
-      </rdeContact:upRr>
-      <rdeContact:upDate>2009-11-26T09:10:00.0Z</rdeContact:upDate>
-      <rdeContact:trDate>2009-12-03T09:05:00.0Z</rdeContact:trDate>
-      <rdeContact:disclose flag="0">
-        <contact:voice/>
-        <contact:email/>
-      </rdeContact:disclose>
-    </rdeContact:contact>
-
     <!-- Registrar: RegistrarX -->
     <rdeRegistrar:registrar>
       <rdeRegistrar:id>RegistrarX</rdeRegistrar:id>
@@ -223,9 +173,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html
       <rdeEppParams:objURI>
         urn:ietf:params:xml:ns:domain-1.0
       </rdeEppParams:objURI>
-      <rdeEppParams:objURI>
-        urn:ietf:params:xml:ns:contact-1.0
-      </rdeEppParams:objURI>
       <rdeEppParams:objURI>
         urn:ietf:params:xml:ns:host-1.0
       </rdeEppParams:objURI>

core/src/test/resources/google/registry/rde/deposit_full_different.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rde:deposit type="FULL" id="20101017001" prevId="20101010001"
   xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
-  xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
   xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
   xmlns:rde="urn:ietf:params:xml:ns:rde-1.0"
   xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0"
   xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0"
   xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0"
-  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
   xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
   xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0"
   xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -19,7 +17,6 @@
   <rde:rdeMenu>
     <rde:version>1.0</rde:version>
     <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
-    <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
@@ -39,9 +36,6 @@
       <rdeHeader:count
         uri="urn:ietf:params:xml:ns:rdeHost-1.0">1
         </rdeHeader:count>
-      <rdeHeader:count
-        uri="urn:ietf:params:xml:ns:rdeContact-1.0">1
-        </rdeHeader:count>
       <rdeHeader:count
         uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">1
     </rdeHeader:count>
@@ -61,9 +55,6 @@
       <rdeDom:name>example1.test</rdeDom:name>
       <rdeDom:roid>Dexample1-TEST</rdeDom:roid>
       <rdeDom:status s="ok"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
       <rdeDom:ns>
         <domain:hostObj>ns1.example.com</domain:hostObj>
         <domain:hostObj>ns1.example1.test</domain:hostObj>
@@ -80,9 +71,6 @@
       <rdeDom:roid>Dexample3-TEST</rdeDom:roid>
       <rdeDom:status s="ok"/>
       <rdeDom:status s="clientUpdateProhibited"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
       <rdeDom:clID>RegistrarY</rdeDom:clID>
       <rdeDom:crRr>RegistrarY</rdeDom:crRr>
       <rdeDom:crDate>1999-04-03T22:00:00.0Z</rdeDom:crDate>
@@ -123,44 +111,6 @@
       <rdeHost:upDate>2009-10-03T09:34:00.0Z</rdeHost:upDate>
     </rdeHost:host>
 
-    <!-- Contact: sh8013 -->
-    <rdeContact:contact>
-      <rdeContact:id>sh8013</rdeContact:id>
-      <rdeContact:roid>Csh8013-TEST</rdeContact:roid>
-      <rdeContact:status s="linked"/>
-      <rdeContact:status s="clientDeleteProhibited"/>
-      <rdeContact:postalInfo type="int">
-        <contact:name>John Doe</contact:name>
-        <contact:org>Example Inc.</contact:org>
-        <contact:addr>
-          <contact:street>123 Example Dr.</contact:street>
-          <contact:street>Suite 100</contact:street>
-          <contact:city>Dulles</contact:city>
-          <contact:sp>VA</contact:sp>
-          <contact:pc>20166-6503</contact:pc>
-          <contact:cc>US</contact:cc>
-        </contact:addr>
-      </rdeContact:postalInfo>
-      <rdeContact:voice x="1234">+1.7035555555
-      </rdeContact:voice>
-      <rdeContact:fax>+1.7035555556
-      </rdeContact:fax>
-      <rdeContact:email>jdoe@example.test
-      </rdeContact:email>
-      <rdeContact:clID>RegistrarX</rdeContact:clID>
-      <rdeContact:crRr client="jdoe">RegistrarX
-      </rdeContact:crRr>
-      <rdeContact:crDate>2009-09-13T08:01:00.0Z</rdeContact:crDate>
-      <rdeContact:upRr client="jdoe">RegistrarX
-      </rdeContact:upRr>
-      <rdeContact:upDate>2009-11-26T09:10:00.0Z</rdeContact:upDate>
-      <rdeContact:trDate>2009-12-03T09:05:00.0Z</rdeContact:trDate>
-      <rdeContact:disclose flag="0">
-        <contact:voice/>
-        <contact:email/>
-      </rdeContact:disclose>
-    </rdeContact:contact>
-
     <!-- Registrar: RegistrarX -->
     <rdeRegistrar:registrar>
       <rdeRegistrar:id>RegistrarX</rdeRegistrar:id>
@@ -259,9 +209,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html
       <rdeEppParams:objURI>
         urn:ietf:params:xml:ns:domain-1.0
       </rdeEppParams:objURI>
-      <rdeEppParams:objURI>
-        urn:ietf:params:xml:ns:contact-1.0
-      </rdeEppParams:objURI>
       <rdeEppParams:objURI>
         urn:ietf:params:xml:ns:host-1.0
       </rdeEppParams:objURI>

core/src/test/resources/google/registry/rde/deposit_full_out_of_order.xml

@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rde:deposit type="FULL" id="20101017001" prevId="20101010001"
   xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
-  xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
   xmlns:secDNS="urn:ietf:params:xml:ns:secDNS-1.1"
   xmlns:rde="urn:ietf:params:xml:ns:rde-1.0"
   xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0"
   xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0"
   xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0"
-  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
   xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
   xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0"
   xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -19,7 +17,6 @@
   <rde:rdeMenu>
     <rde:version>1.0</rde:version>
     <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
-    <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
@@ -39,9 +36,6 @@
       <rdeHeader:count
         uri="urn:ietf:params:xml:ns:rdeHost-1.0">1
         </rdeHeader:count>
-      <rdeHeader:count
-        uri="urn:ietf:params:xml:ns:rdeContact-1.0">1
-        </rdeHeader:count>
       <rdeHeader:count
         uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">1
     </rdeHeader:count>
@@ -62,9 +56,6 @@
       <rdeDom:roid>Dexample2-TEST</rdeDom:roid>
       <rdeDom:status s="ok"/>
       <rdeDom:status s="clientUpdateProhibited"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
       <rdeDom:clID>RegistrarX</rdeDom:clID>
       <rdeDom:crRr>RegistrarX</rdeDom:crRr>
       <rdeDom:crDate>1999-04-03T22:00:00.0Z</rdeDom:crDate>
@@ -76,9 +67,6 @@
       <rdeDom:name>example1.test</rdeDom:name>
       <rdeDom:roid>Dexample1-TEST</rdeDom:roid>
       <rdeDom:status s="ok"/>
-      <rdeDom:registrant>jd1234</rdeDom:registrant>
-      <rdeDom:contact type="admin">sh8013</rdeDom:contact>
-      <rdeDom:contact type="tech">sh8013</rdeDom:contact>
       <rdeDom:ns>
         <domain:hostObj>ns1.example.com</domain:hostObj>
         <domain:hostObj>ns1.example1.test</domain:hostObj>
@@ -125,44 +113,6 @@
       <rdeHost:upDate>2009-10-03T09:34:00.0Z</rdeHost:upDate>
     </rdeHost:host>
 
-    <!-- Contact: sh8013 -->
-    <rdeContact:contact>
-      <rdeContact:id>sh8013</rdeContact:id>
-      <rdeContact:roid>Csh8013-TEST</rdeContact:roid>
-      <rdeContact:status s="linked"/>
-      <rdeContact:status s="clientDeleteProhibited"/>
-      <rdeContact:postalInfo type="int">
-        <contact:name>John Doe</contact:name>
-        <contact:org>Example Inc.</contact:org>
-        <contact:addr>
-          <contact:street>123 Example Dr.</contact:street>
-          <contact:street>Suite 100</contact:street>
-          <contact:city>Dulles</contact:city>
-          <contact:sp>VA</contact:sp>
-          <contact:pc>20166-6503</contact:pc>
-          <contact:cc>US</contact:cc>
-        </contact:addr>
-      </rdeContact:postalInfo>
-      <rdeContact:voice x="1234">+1.7035555555
-      </rdeContact:voice>
-      <rdeContact:fax>+1.7035555556
-      </rdeContact:fax>
-      <rdeContact:email>jdoe@example.test
-      </rdeContact:email>
-      <rdeContact:clID>RegistrarX</rdeContact:clID>
-      <rdeContact:crRr client="jdoe">RegistrarX
-      </rdeContact:crRr>
-      <rdeContact:crDate>2009-09-13T08:01:00.0Z</rdeContact:crDate>
-      <rdeContact:upRr client="jdoe">RegistrarX
-      </rdeContact:upRr>
-      <rdeContact:upDate>2009-11-26T09:10:00.0Z</rdeContact:upDate>
-      <rdeContact:trDate>2009-12-03T09:05:00.0Z</rdeContact:trDate>
-      <rdeContact:disclose flag="0">
-        <contact:voice/>
-        <contact:email/>
-      </rdeContact:disclose>
-    </rdeContact:contact>
-
     <!-- Registrar: RegistrarX -->
     <rdeRegistrar:registrar>
       <rdeRegistrar:id>RegistrarX</rdeRegistrar:id>
@@ -225,9 +175,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html
       <rdeEppParams:objURI>
         urn:ietf:params:xml:ns:domain-1.0
       </rdeEppParams:objURI>
-      <rdeEppParams:objURI>
-        urn:ietf:params:xml:ns:contact-1.0
-      </rdeEppParams:objURI>
       <rdeEppParams:objURI>
         urn:ietf:params:xml:ns:host-1.0
       </rdeEppParams:objURI>

core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesExpectedXml.xml

@@ -19,16 +19,13 @@
              xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
              xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0"
              xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
-             xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
              xmlns:rdeDomain="urn:ietf:params:xml:ns:rdeDomain-1.0"
-             xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
              xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
              type="FULL"
              id="AAAABXDKZ6WAA">
     <rde:watermark>2000-01-01T00:00:00Z</rde:watermark>
     <rde:rdeMenu>
         <rde:version>1.0</rde:version>
-        <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
         <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
         <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
         <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
@@ -171,75 +168,6 @@
     </rdeDomain:trnData>
 </rdeDomain:domain>
 
-<rdeContact:contact>
-    <rdeContact:id>5372808-IRL</rdeContact:id>
-    <rdeContact:roid>6-ROID</rdeContact:roid>
-    <rdeContact:status s="ok"/>
-    <rdeContact:postalInfo type="int">
-        <contact:name>be that word our sign in parting</contact:name>
-        <contact:org>DOGE INCORPORATED</contact:org>
-        <contact:addr>
-            <contact:street>123 Example Boulevard</contact:street>
-            <contact:city>KOKOMO</contact:city>
-            <contact:sp>BM</contact:sp>
-            <contact:pc>31337</contact:pc>
-            <contact:cc>US</contact:cc>
-        </contact:addr>
-    </rdeContact:postalInfo>
-    <rdeContact:voice>+1.5558675309</rdeContact:voice>
-    <rdeContact:fax>+1.5558675310</rdeContact:fax>
-    <rdeContact:email>BOFH@cat.みんな</rdeContact:email>
-    <rdeContact:clID>GetTheeBack</rdeContact:clID>
-    <rdeContact:crRr>GetTheeBack</rdeContact:crRr>
-    <rdeContact:crDate>1999-12-31T00:00:00Z</rdeContact:crDate>
-</rdeContact:contact>
-
-<rdeContact:contact>
-    <rdeContact:id>5372808-TRL</rdeContact:id>
-    <rdeContact:roid>7-ROID</rdeContact:roid>
-    <rdeContact:status s="ok"/>
-    <rdeContact:postalInfo type="int">
-        <contact:name>bird or fiend!? i shrieked upstarting</contact:name>
-        <contact:org>DOGE INCORPORATED</contact:org>
-        <contact:addr>
-            <contact:street>123 Example Boulevard</contact:street>
-            <contact:city>KOKOMO</contact:city>
-            <contact:sp>BM</contact:sp>
-            <contact:pc>31337</contact:pc>
-            <contact:cc>US</contact:cc>
-        </contact:addr>
-    </rdeContact:postalInfo>
-    <rdeContact:voice>+1.5558675309</rdeContact:voice>
-    <rdeContact:fax>+1.5558675310</rdeContact:fax>
-    <rdeContact:email>bog@cat.みんな</rdeContact:email>
-    <rdeContact:clID>GetTheeBack</rdeContact:clID>
-    <rdeContact:crRr>GetTheeBack</rdeContact:crRr>
-    <rdeContact:crDate>1999-12-31T00:00:00Z</rdeContact:crDate>
-</rdeContact:contact>
-
-<rdeContact:contact>
-    <rdeContact:id>5372808-ERL</rdeContact:id>
-    <rdeContact:roid>3-ROID</rdeContact:roid>
-    <rdeContact:status s="ok"/>
-    <rdeContact:postalInfo type="int">
-        <contact:name>(◕‿◕) nevermore</contact:name>
-        <contact:org>DOGE INCORPORATED</contact:org>
-        <contact:addr>
-            <contact:street>123 Example Boulevard</contact:street>
-            <contact:city>KOKOMO</contact:city>
-            <contact:sp>BM</contact:sp>
-            <contact:pc>31337</contact:pc>
-            <contact:cc>US</contact:cc>
-        </contact:addr>
-    </rdeContact:postalInfo>
-    <rdeContact:voice>+1.5558675309</rdeContact:voice>
-    <rdeContact:fax>+1.5558675310</rdeContact:fax>
-    <rdeContact:email>prophet@evil.みんな</rdeContact:email>
-    <rdeContact:clID>GetTheeBack</rdeContact:clID>
-    <rdeContact:crRr>GetTheeBack</rdeContact:crRr>
-    <rdeContact:crDate>1999-12-31T00:00:00Z</rdeContact:crDate>
-</rdeContact:contact>
-
 <rdeIDN:idnTableRef id="extended_latin">
     <rdeIDN:url>https://www.iana.org/domains/idn-tables/tables/google_latn_1.0.txt</rdeIDN:url>
     <rdeIDN:urlPolicy>https://www.registry.google/about/policies/domainabuse/</rdeIDN:urlPolicy>

core/src/test/resources/google/registry/rde/testMapReduce_withDomain_producesReportXml.xml

@@ -18,10 +18,8 @@
                   xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
                   xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
                   xmlns:rgp="urn:ietf:params:xml:ns:rgp-1.0"
-                  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
                   xmlns:rdeDomain="urn:ietf:params:xml:ns:rdeDomain-1.0"
                   xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
-                  xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
                   xmlns:domain="urn:ietf:params:xml:ns:domain-1.0">
     <rdeReport:id>AAAABXDKZ6WAA</rdeReport:id>
     <rdeReport:version>1</rdeReport:version>
@@ -33,7 +31,6 @@
     <rdeReport:watermark>2000-01-01T00:00:00Z</rdeReport:watermark>
     <rdeHeader:header>
         <rdeHeader:tld>lol</rdeHeader:tld>
-        <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeContact-1.0">3</rdeHeader:count>
         <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeDomain-1.0">1</rdeHeader:count>
         <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeHost-1.0">2</rdeHeader:count>
         <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">2</rdeHeader:count>

core/src/test/resources/google/registry/tools/server/xn--q9jyb4c_2010-10-17_full_S1_R0.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <rde:deposit xmlns:domain="urn:ietf:params:xml:ns:domain-1.0"
-             xmlns:contact="urn:ietf:params:xml:ns:contact-1.0"
-             xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
              xmlns:rdeDomain="urn:ietf:params:xml:ns:rdeDomain-1.0"
              xmlns:epp="urn:ietf:params:xml:ns:epp-1.0"
              xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -28,7 +26,6 @@
     <rde:watermark>2010-10-17T00:00:00Z</rde:watermark>
     <rde:rdeMenu>
         <rde:version>1.0</rde:version>
-        <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
         <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
         <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
         <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
@@ -132,7 +129,6 @@
 <rdeHeader:header>
   <rdeHeader:tld>xn--q9jyb4c</rdeHeader:tld>
   <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeDomain-1.0">0</rdeHeader:count>
-  <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeContact-1.0">0</rdeHeader:count>
   <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeHost-1.0">1</rdeHeader:count>
   <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeRegistrar-1.0">2</rdeHeader:count>
   <rdeHeader:count uri="urn:ietf:params:xml:ns:rdeIDN-1.0">4</rdeHeader:count>

core/src/test/resources/google/registry/xjc/rde_deposit_differential.xml

@@ -7,7 +7,6 @@
   xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0"
   xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0"
   xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0"
-  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
   xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
   xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0"
   xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -18,7 +17,6 @@
   <rde:rdeMenu>
     <rde:version>1.0</rde:version>
     <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
-    <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>

core/src/test/resources/google/registry/xjc/rde_deposit_full.xml

@@ -7,7 +7,6 @@
   xmlns:rdeHeader="urn:ietf:params:xml:ns:rdeHeader-1.0"
   xmlns:rdeDom="urn:ietf:params:xml:ns:rdeDomain-1.0"
   xmlns:rdeHost="urn:ietf:params:xml:ns:rdeHost-1.0"
-  xmlns:rdeContact="urn:ietf:params:xml:ns:rdeContact-1.0"
   xmlns:rdeRegistrar="urn:ietf:params:xml:ns:rdeRegistrar-1.0"
   xmlns:rdeIDN="urn:ietf:params:xml:ns:rdeIDN-1.0"
   xmlns:rdeNNDN="urn:ietf:params:xml:ns:rdeNNDN-1.0"
@@ -19,7 +18,6 @@
   <rde:rdeMenu>
     <rde:version>1.0</rde:version>
     <rde:objURI>urn:ietf:params:xml:ns:rdeHeader-1.0</rde:objURI>
-    <rde:objURI>urn:ietf:params:xml:ns:rdeContact-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeHost-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeDomain-1.0</rde:objURI>
     <rde:objURI>urn:ietf:params:xml:ns:rdeRegistrar-1.0</rde:objURI>
@@ -106,44 +104,6 @@
       <rdeHost:upDate>2009-10-03T09:34:00.0Z</rdeHost:upDate>
     </rdeHost:host>
 
-    <!-- Contact: sh8013 -->
-    <rdeContact:contact>
-      <rdeContact:id>sh8013</rdeContact:id>
-      <rdeContact:roid>Csh8013-TEST</rdeContact:roid>
-      <rdeContact:status s="linked"/>
-      <rdeContact:status s="clientDeleteProhibited"/>
-      <rdeContact:postalInfo type="int">
-        <contact:name>Jane Doe</contact:name>
-        <contact:org>Example Inc.</contact:org>
-        <contact:addr>
-          <contact:street>123 Example Dr.</contact:street>
-          <contact:street>Suite 100</contact:street>
-          <contact:city>Dulles</contact:city>
-          <contact:sp>VA</contact:sp>
-          <contact:pc>20166-6503</contact:pc>
-          <contact:cc>US</contact:cc>
-        </contact:addr>
-      </rdeContact:postalInfo>
-      <rdeContact:voice x="1234">+1.7035555555
-      </rdeContact:voice>
-      <rdeContact:fax>+1.7035555556
-      </rdeContact:fax>
-      <rdeContact:email>jdoe@example.test
-      </rdeContact:email>
-      <rdeContact:clID>RegistrarX</rdeContact:clID>
-      <rdeContact:crRr client="jdoe">RegistrarX
-      </rdeContact:crRr>
-      <rdeContact:crDate>2009-09-13T08:01:00.0Z</rdeContact:crDate>
-      <rdeContact:upRr client="jdoe">RegistrarX
-      </rdeContact:upRr>
-      <rdeContact:upDate>2009-11-26T09:10:00.0Z</rdeContact:upDate>
-      <rdeContact:trDate>2009-12-03T09:05:00.0Z</rdeContact:trDate>
-      <rdeContact:disclose flag="0">
-        <contact:voice/>
-        <contact:email/>
-      </rdeContact:disclose>
-    </rdeContact:contact>
-
     <!-- Registrar: RegistrarX -->
     <rdeRegistrar:registrar>
       <rdeRegistrar:id>RegistrarX</rdeRegistrar:id>
@@ -206,9 +166,6 @@ http://www.iana.org/domains/idn-tables/tables/br_pt-br_1.0.html
       <rdeEppParams:objURI>
         urn:ietf:params:xml:ns:domain-1.0
       </rdeEppParams:objURI>
-      <rdeEppParams:objURI>
-        urn:ietf:params:xml:ns:contact-1.0
-      </rdeEppParams:objURI>
       <rdeEppParams:objURI>
         urn:ietf:params:xml:ns:host-1.0
       </rdeEppParams:objURI>

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

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

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

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

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

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