feat: separate Sourcify-specific param from base verification task params

Author: schaable

v-next/hardhat-verify/src/internal/tasks/verify/index.ts

@@ -2,10 +2,12 @@ import type { NewTaskDefinition } from "hardhat/types/tasks";
 
 import { task } from "hardhat/config";
 
-import { extendWithVerificationArgs } from "./utils.js";
+import { extendWithSourcifyArgs, extendWithVerificationArgs } from "./utils.js";
 
-const verifyTask: NewTaskDefinition = extendWithVerificationArgs(
-  task("verify", "Verify a contract on all supported explorers"),
+const verifyTask: NewTaskDefinition = extendWithSourcifyArgs(
+  extendWithVerificationArgs(
+    task("verify", "Verify a contract on all supported explorers"),
+  ),
 )
   .setAction(() => import("./task-action.js"))
   .build();

v-next/hardhat-verify/src/internal/tasks/verify/sourcify/index.ts

@@ -2,10 +2,16 @@ import type { NewTaskDefinition } from "hardhat/types/tasks";
 
 import { task } from "hardhat/config";
 
-import { extendWithVerificationArgs } from "../utils.js";
+import {
+  extendWithSourcifyArgs,
+  extendWithVerificationArgs,
+} from "../utils.js";
 
-const verifySourcifyTask: NewTaskDefinition = extendWithVerificationArgs(
-  task(["verify", "sourcify"], "Verify a contract on Sourcify"),
+const verifySourcifyTask: NewTaskDefinition = extendWithSourcifyArgs(
+  extendWithVerificationArgs(
+    task(["verify", "sourcify"], "Verify a contract on Sourcify"),
+  ),
+  false,
 )
   .setAction(() => import("./task-action.js"))
   .build();

v-next/hardhat-verify/src/internal/tasks/verify/types.ts

@@ -1,17 +1,20 @@
 import type { LibraryAddresses } from "../../libraries.js";
 
-export interface VerifyActionArgs {
+export interface BaseVerifyActionArgs {
   address: string;
   constructorArgs: string[];
   constructorArgsPath?: string;
   contract?: string;
   librariesPath?: string;
   force?: boolean;
-  creationTxHash?: string;
   // TODO: M5
   // listNetworks?: boolean;
 }
 
+export interface VerifyActionArgs extends BaseVerifyActionArgs {
+  creationTxHash?: string; // Sourcify specific
+}
+
 export interface VerifyActionResolvedArgs {
   address: string;
   constructorArgs: unknown[];

v-next/hardhat-verify/src/internal/tasks/verify/utils.ts

@@ -1,11 +1,11 @@
-import type { VerifyActionArgs } from "./types.js";
+import type { BaseVerifyActionArgs, VerifyActionArgs } from "./types.js";
 import type { NewTaskDefinitionBuilder } from "hardhat/types/tasks";
 
 import { ArgumentType } from "hardhat/types/arguments";
 
 export function extendWithVerificationArgs(
   task: NewTaskDefinitionBuilder,
-): NewTaskDefinitionBuilder<VerifyActionArgs> {
+): NewTaskDefinitionBuilder<BaseVerifyActionArgs> {
   return task
     .addPositionalArgument({
       name: "address",
@@ -41,13 +41,6 @@ export function extendWithVerificationArgs(
       name: "force",
       description:
         "Force the verification even if the contract is already verified",
-    })
-    .addOption({
-      name: "creationTxHash",
-      type: ArgumentType.STRING_WITHOUT_DEFAULT,
-      description:
-        "The hash of the contract creation transaction (optional, used by Sourcify)",
-      defaultValue: undefined,
     });
   /* TODO: M5
     .addFlag({
@@ -56,3 +49,17 @@ export function extendWithVerificationArgs(
     });
   */
 }
+
+export function extendWithSourcifyArgs(
+  task: NewTaskDefinitionBuilder<BaseVerifyActionArgs>,
+  isMainTask: boolean = true,
+): NewTaskDefinitionBuilder<VerifyActionArgs> {
+  return task.addOption({
+    name: "creationTxHash",
+    type: ArgumentType.STRING_WITHOUT_DEFAULT,
+    description:
+      "The hash of the contract creation transaction" +
+      (isMainTask ? " (Sourcify only)" : ""),
+    defaultValue: undefined,
+  });
+}