feat(premigration): add flat grace period to all expiries

Replace the conditional --min-expiry-days padding (which only extended
short v1 expiries up to a minimum) with a flat --grace-period-days
(default 90) that is unconditionally added on top of every migrated
name's v1 expiry. Preserves relative ordering of expiries while giving
all migrated names uniform extra breathing room post-migration.

Author: hiddentao

contracts/docs/premigration.md

@@ -48,7 +48,7 @@ bun run script/preMigration.ts [options]
 | `--limit <number>` | none | Maximum total names to process |
 | `--dry-run` | `false` | Simulate without sending transactions |
 | `--continue` | `false` | Resume from the last checkpoint |
-| `--min-expiry-days <days>` | `7` | Pad v2 expiry so no reserved name expires within this many days. Names whose v1 expiry falls within the window are reserved on v2 with the expiry extended up to `now + minExpiryDays`. |
+| `--grace-period-days <days>` | `90` | Days of grace period added on top of each name's v1 expiry. Every reserved name gets `v1Expiry + gracePeriodDays` as its v2 expiry. Set to `0` to preserve v1 expiries exactly. |
 | `--v1-base-registrar <address>` | `0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85` | v1 BaseRegistrar address for expiry lookups |
 
 ## CSV Format
@@ -85,8 +85,7 @@ The script handles quoted fields and escaped quotes within CSV values.
    - If already **registered** (status 2): fail — name is fully owned on v2
    - If already **reserved** (status 1): mark for potential renewal
    - If not registered or expired on v1: skip
-   - If v1 expiry is within `--min-expiry-days`: pad the v2 expiry up to `now + min-expiry-days` and add to the batch
-   - Otherwise: add to the batch reservation list with the v1 expiry
+   - Add to the batch reservation list with v2 expiry = `v1Expiry + --grace-period-days`
 9. **Estimate gas** for the batch and preemptively split if estimated gas exceeds 80% of the block gas limit
 10. **Submit batch transaction** via `BatchRegistrar.batchRegister()`. If a batch reverts, recursively split it in half (binary-search fallback) until individual failing names are isolated.
 11. **Save checkpoint** after each batch
@@ -101,7 +100,6 @@ The script handles quoted fields and escaped quotes within CSV values.
 | Reserved (1) | Registered with same expiry | **Skip** (already up-to-date) |
 | Registered (2) | Any | **Fail** (already fully registered) |
 | Any | Expired or never registered | **Skip** |
-| Available (0) | Expiring within `min-expiry-days` | **Reserve** on v2 with padded expiry (`now + min-expiry-days`) |
 
 ### On-Chain Registration Parameters
 
@@ -110,7 +108,7 @@ Each name is reserved with:
 - **registry**: `address(0)`
 - **resolver**: The ENSV1Resolver address (for fallback resolution to v1 records)
 - **roleBitmap**: `0`
-- **expires**: The v1 expiry timestamp
+- **expires**: The v1 expiry timestamp plus `--grace-period-days`
 
 ## Batch Processing
 
@@ -173,7 +171,7 @@ Dry run still:
 - Reads and parses the CSV
 - Checks v2 state for each name
 - Verifies v1 registration and expiry
-- Applies `--min-expiry-days` padding
+- Applies `--grace-period-days` to each expiry
 - Logs what would happen
 - Saves checkpoints
 
@@ -218,7 +216,6 @@ Success rate:                   99%
 |---|---|
 | Invalid/empty label in CSV | Filtered out before processing, counted as `invalidLabelCount` |
 | Name not registered on v1 | Skipped, counted as `skippedCount` |
-| Name expiring within `min-expiry-days` | Reserved on v2 with expiry padded to `now + min-expiry-days` |
 | Name already fully registered on v2 | Counted as failure |
 | Batch transaction reverts | Binary-search split: recursively halves the batch until individual failures are isolated |
 | Batch gas estimate exceeds 80% of block limit | Preemptively splits the batch before submitting |
@@ -277,13 +274,13 @@ bun run script/preMigration.ts \
 bun run script/preMigration.ts --continue [same options]
 ```
 
-### Pad short expiries to at least 30 days
+### Custom grace period
 
 ```bash
-bun run script/preMigration.ts --min-expiry-days 30 [other options]
+bun run script/preMigration.ts --grace-period-days 180 [other options]
 ```
 
-Any name whose v1 expiry is within 30 days of now is still reserved on v2, but with its v2 expiry extended to `now + 30 days`.
+Every reserved name's v2 expiry is set to `v1Expiry + 180 days`. Pass `0` to preserve v1 expiries exactly.
 
 ### Custom v1 BaseRegistrar (for testing)
 

contracts/script/preMigration.ts

@@ -109,7 +109,7 @@ export interface PreMigrationConfig {
   dryRun: boolean;
   continue?: boolean;
   disableCheckpoint?: boolean;
-  minExpiryDays: number;
+  gracePeriodDays: number;
   v1ResolverAddress: Address;
   v1BaseRegistrarAddress: Address;
 }
@@ -296,17 +296,6 @@ class PreMigrationLogger extends Logger {
     );
   }
 
-  paddingExpiry(
-    name: string,
-    originalDays: number,
-    paddedDays: number,
-  ): void {
-    this.raw(
-      cyan(`  → ⇪ Padding expiry: ${bold(name)}.eth`) +
-        dim(` (${originalDays}d → ${paddedDays}d)`),
-      `  → ⇪ Padding expiry: ${name}.eth (${originalDays}d → ${paddedDays}d)`,
-    );
-  }
 }
 
 const logger = new PreMigrationLogger();
@@ -853,9 +842,7 @@ async function processBatch(
   const alreadyReservedNames = new Set<string>();
   let lastLineNumber = checkpoint.lastProcessedLineNumber;
 
-  const minExpiryThreshold = BigInt(
-    Math.floor(Date.now() / 1000) + config.minExpiryDays * 86400,
-  );
+  const gracePeriodSeconds = BigInt(config.gracePeriodDays) * 86400n;
 
   const verificationResults = await batchVerifyRegistrations(
     registrations,
@@ -912,17 +899,7 @@ async function processBatch(
       continue;
     }
 
-    let effectiveExpiry = result.v1Expiry;
-    if (result.v1Expiry <= minExpiryThreshold) {
-      const nowSeconds = BigInt(Math.floor(Date.now() / 1000));
-      const originalDays = Number((result.v1Expiry - nowSeconds) / 86400n);
-      effectiveExpiry = minExpiryThreshold;
-      logger.paddingExpiry(
-        registration.labelName,
-        originalDays,
-        config.minExpiryDays,
-      );
-    }
+    const effectiveExpiry = result.v1Expiry + gracePeriodSeconds;
 
     const expiryDateFormatted = new Date(Number(effectiveExpiry) * 1000)
       .toISOString()
@@ -1096,9 +1073,9 @@ export async function main(argv = process.argv): Promise<void> {
       false,
     )
     .option(
-      "--min-expiry-days <days>",
-      "Pad v2 expiry so no reserved name expires within this many days",
-      "7",
+      "--grace-period-days <days>",
+      "Days of grace period to add on top of each name's v1 expiry",
+      "90",
     )
     .requiredOption(
       "--v1-resolver <address>",
@@ -1134,9 +1111,9 @@ export async function main(argv = process.argv): Promise<void> {
     limit: opts.limit ? parseInt(opts.limit) : null,
     dryRun: opts.dryRun,
     continue: opts.continue,
-    minExpiryDays: Number.isNaN(parseInt(opts.minExpiryDays))
-      ? 7
-      : parseInt(opts.minExpiryDays),
+    gracePeriodDays: Number.isNaN(parseInt(opts.gracePeriodDays))
+      ? 90
+      : parseInt(opts.gracePeriodDays),
     v1ResolverAddress: opts.v1Resolver as Address,
     v1BaseRegistrarAddress: opts.v1BaseRegistrar as Address,
   };
@@ -1156,7 +1133,7 @@ export async function main(argv = process.argv): Promise<void> {
     logger.config("Mainnet RPC (v1)", config.mainnetRpcUrl);
     logger.config("CSV File", config.csvFilePath);
     logger.config("Batch Size", config.batchSize);
-    logger.config("Min Expiry Days", config.minExpiryDays);
+    logger.config("Grace Period Days", config.gracePeriodDays);
     logger.config("V1 Resolver", config.v1ResolverAddress);
     logger.config("Limit", config.limit ?? "none");
     logger.config("Dry Run", config.dryRun);

contracts/test/e2e/preMigration.test.ts

@@ -195,48 +195,47 @@ describe("PreMigration", () => {
     expect(state3.status).toBe(STATUS.AVAILABLE);
   });
 
-  it("pads expiries shorter than minExpiryDays", async () => {
+  it("adds grace period to short v1 expiries", async () => {
     const label = "soonexpire";
     const { user } = env.namedAccounts;
 
     const fiveDays = 5 * 24 * 60 * 60;
-    await registerV1Name(env, label, user.address, fiveDays);
+    const v1Expiry = await registerV1Name(
+      env,
+      label,
+      user.address,
+      fiveDays,
+    );
 
     createCSVFile(csvFilePath, [label]);
-    const minExpiryDays = 7;
-    const nowSeconds = BigInt(Math.floor(Date.now() / 1000));
-    const args = buildMainArgs(env, csvFilePath, { minExpiryDays });
+    const gracePeriodDays = 90;
+    const args = buildMainArgs(env, csvFilePath, { gracePeriodDays });
     await main(args);
 
     const state = await verifyV2State(env, label);
     expect(state.status).toBe(STATUS.RESERVED);
-
-    const expectedMin =
-      nowSeconds + BigInt(minExpiryDays) * 86400n - 120n;
-    const expectedMax =
-      BigInt(Math.floor(Date.now() / 1000)) +
-      BigInt(minExpiryDays) * 86400n +
-      120n;
-    expect(state.expiry).toBeGreaterThanOrEqual(expectedMin);
-    expect(state.expiry).toBeLessThanOrEqual(expectedMax);
+    expect(state.expiry).toBe(v1Expiry + BigInt(gracePeriodDays) * 86400n);
   });
 
-  it("preserves v1 expiry when above minExpiryDays threshold", async () => {
+  it("adds grace period to long v1 expiries", async () => {
     const label = "longexpire";
     const { user } = env.namedAccounts;
 
-    await registerV1Name(env, label, user.address, ONE_YEAR_SECONDS);
+    const v1Expiry = await registerV1Name(
+      env,
+      label,
+      user.address,
+      ONE_YEAR_SECONDS,
+    );
 
     createCSVFile(csvFilePath, [label]);
-    const args = buildMainArgs(env, csvFilePath, { minExpiryDays: 7 });
+    const gracePeriodDays = 90;
+    const args = buildMainArgs(env, csvFilePath, { gracePeriodDays });
     await main(args);
 
     const state = await verifyV2State(env, label);
     expect(state.status).toBe(STATUS.RESERVED);
-
-    const paddedCeiling =
-      BigInt(Math.floor(Date.now() / 1000)) + 30n * 86400n;
-    expect(state.expiry).toBeGreaterThan(paddedCeiling);
+    expect(state.expiry).toBe(v1Expiry + BigInt(gracePeriodDays) * 86400n);
   });
 
   it("handles checkpoint resumption", async () => {

contracts/test/utils/mockPreMigration.ts

@@ -58,7 +58,7 @@ export function buildMainArgs(
     dryRun?: boolean;
     limit?: number;
     continue?: boolean;
-    minExpiryDays?: number;
+    gracePeriodDays?: number;
     batchSize?: number;
     useEnvVarForPrivateKey?: boolean;
     omitPrivateKey?: boolean;
@@ -82,8 +82,8 @@ export function buildMainArgs(
     env.v2.ENSV1Resolver.address,
     "--mainnet-rpc-url",
     rpcUrl,
-    "--min-expiry-days",
-    String(overrides.minExpiryDays ?? 0),
+    "--grace-period-days",
+    String(overrides.gracePeriodDays ?? 0),
     "--v1-base-registrar",
     env.v1.BaseRegistrar.address,
   ];