Alpha 3

README.md

@@ -78,14 +78,12 @@ module.exports = {
     to: -1,
     only: -1,
     skip: -1,
-    txConfirmations: 1,
-    verifyConfirmations: 0,
-    verify: "at-the-end",
+    wait: 1,
+    verify: false,
     attempts: 0,
     pathToMigrations: "./deploy",
-    skipVerificationErrors: ["already verified"],
     force: false,
-    continuePreviousDeployment: false,
+    continue: false,
   },
 };
 ```
@@ -96,19 +94,12 @@ module.exports = {
 - `to` : The migration number up to which the migration will be applied.
 - `only` : The number of the migration that will be applied. **Overrides from and to parameters.**
 - `skip`: The number of migration to skip. **Overrides only parameter.**
-- `txConfirmations` : The number of confirmations to wait for after the transaction is mined.
-- `verifyConfirmations` : The number of confirmations to wait for before sending a request to etherscan.
-- `verify` : The strategy of verification. The user can choose between `immediately`, `at-the-end` and `none`.
-  - `immediately`: the verification will start immediately after the contract is deployed. However, the execution will wait `verifyConfirmations` number of blocks before sending a request to etherscan.
-  - `at-the-end`: the verification will start after all migrations are applied.
-  - `none`: the verification will not be performed.
+- `wait` : The number of confirmations to wait for after the transaction is mined.
+- `verify` : The flag indicating whether the contracts should be verified.
 - `attempts`: The number of attempts to verify the contract.
 - `pathToMigrations` : The path to the folder with the specified migrations.
-- `skipVerificationErrors` : The user can specify custom verification errors that will be omitted and just be printed
-  to the log instead of stopping the program completely.
-  By default, if this parameter is not specified, the `already verified` error is omitted.
 - `force` : The flag indicating whether the contracts compilation is forced.
-- `continuePreviousDeployment` : The flag indicating whether the deployment should restore the state from the previous deployment.
+- `continue` : The flag indicating whether the deployment should restore the state from the previous deployment.
 
 ### Deploying
 
@@ -117,7 +108,7 @@ You can set your own migrations and deploy the contracts to the network you want
 #### With only parameter
 
 ```console
-npx hardhat migrate --network goerli --verify immediately --only 2
+npx hardhat migrate --network goerli --verify --only 2
 ```
 
 In this case, only the migration that begins with digit 2 will be applied. The plugin will also try to automatically verify the deployed contracts.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solarity/hardhat-migrate",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.3",
   "description": "Automatic deployment and verification of smart contracts",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -44,7 +44,6 @@
     "@nomicfoundation/hardhat-verify": "1.1.1",
     "@nomiclabs/hardhat-truffle5": "2.0.7",
     "axios": "1.5.0",
-    "bignumber.js": "9.1.2",
     "ora": "5.4.1"
   },
   "peerDependencies": {
@@ -69,7 +68,7 @@
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-prettier": "^5.0.0",
     "eslint-plugin-promise": "^6.1.1",
-    "ethers": "^6.7.1",
+    "ethers": "^6.8.0",
     "hardhat": "^2.17.0",
     "mocha": "^10.0.0",
     "pinst": "^3.0.0",

src/config.ts

@@ -5,23 +5,28 @@ import { ConfigExtender } from "hardhat/types";
 
 import { pluginName } from "./constants";
 
-import { MigrateConfig, VerifyStrategy } from "./types/migrations";
+import { MigrateConfig, MigrateVerifyConfig } from "./types/migrations";
 
 const defaultConfig: MigrateConfig = {
   from: -1,
   to: -1,
   only: -1,
   skip: -1,
-  txConfirmations: 1,
-  verifyConfirmations: 0,
-  verify: VerifyStrategy.AtTheEnd,
-  attempts: 0,
+  wait: 1,
+  verify: false,
+  verifyParallel: 1,
+  verifyAttempts: 3,
   pathToMigrations: "./deploy",
-  skipVerificationErrors: ["already verified"],
   force: false,
   continue: false,
 };
 
+const defaultVerifyConfig: MigrateVerifyConfig = {
+  inputFile: undefined,
+  parallel: 1,
+  attempts: 3,
+};
+
 export const migrateConfigExtender: ConfigExtender = (resolvedConfig, config) => {
   resolvedConfig.migrate = mergeConfigs(config.migrate, defaultConfig);
 };
@@ -34,14 +39,41 @@ export const mergeConfigs = (
     return defaultConfig;
   }
 
+  if (config.wait && config.wait < 1) {
+    throw new HardhatPluginError(pluginName, "config.migrate.wait must be greater than 0");
+  }
+
+  if (config.verifyParallel && config.verifyParallel < 1) {
+    throw new HardhatPluginError(pluginName, "config.migrate.verifyParallel must be greater than 0");
+  }
+
+  if (config.verifyAttempts && config.verifyAttempts < 1) {
+    throw new HardhatPluginError(pluginName, "config.migrate.verifyAttempts must be greater than 0");
+  }
+
   if (config.pathToMigrations && !isRelativePath(config.pathToMigrations)) {
     throw new HardhatPluginError(pluginName, "config.migrate.pathToMigrations must be a relative path");
   }
 
   return { ...defaultConfig, ...definedProps(config) };
 };
 
-const definedProps = (obj: Partial<MigrateConfig>): Partial<MigrateConfig> =>
-  Object.fromEntries(Object.entries(obj).filter(([, v]) => v !== undefined)) as Partial<MigrateConfig>;
+export const extendVerifyConfigs = (config: Partial<MigrateVerifyConfig> | undefined): MigrateVerifyConfig => {
+  if (config === undefined) {
+    return defaultVerifyConfig;
+  }
+
+  if (config.parallel && config.parallel < 1) {
+    throw new HardhatPluginError(pluginName, "parallel must be greater than 0");
+  }
+
+  if (config.attempts && config.attempts < 1) {
+    throw new HardhatPluginError(pluginName, "attempts must be greater than 0");
+  }
+
+  return { ...defaultVerifyConfig, ...definedProps(config) };
+};
+
+const definedProps = (obj: any): any => Object.fromEntries(Object.entries(obj).filter(([, v]) => v !== undefined));
 
 const isRelativePath = (path?: string): boolean => path === undefined || !isAbsolute(path);

src/constants.ts

@@ -1,2 +1,3 @@
 export const pluginName = "@solarity/hardhat-migrate";
 export const TASK_MIGRATE = "migrate";
+export const TASK_MIGRATE_VERIFY = "migrate:verify";