added option to change deploymentsDir, always persistingArtifacts and conformed errors messages

Author: filippetroviccc

src/Tenderly.ts

@@ -1,8 +1,10 @@
 import * as fs from "fs-extra";
+import { HardhatPluginError } from "hardhat/plugins";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { sep } from "path";
 
 import { DefaultChainId, NetworkMap, PluginName } from "./index";
+import { CONTRACTS_NOT_DETECTED } from "./tenderly/errors";
 import { TenderlyService } from "./tenderly/TenderlyService";
 import {
   ContractByName,
@@ -17,8 +19,6 @@ import {
   getContracts,
   resolveDependencies
 } from "./util";
-import {CONTRACTS_NOT_DETECTED} from "./tenderly/errors";
-import {HardhatPluginError} from "hardhat/plugins";
 
 export class Tenderly {
   public env: HardhatRuntimeEnvironment;
@@ -184,7 +184,9 @@ export class Tenderly {
           if (chainID === undefined) {
             chainID = DefaultChainId;
           }
-          const destPath = `deployments${sep}${network!.toLowerCase()}_${chainID}${sep}`;
+          const deploymentsFolder =
+            this.env.config?.tenderly?.deploymentsDir || "deployments";
+          const destPath = `${deploymentsFolder}${sep}${network!.toLowerCase()}_${chainID}${sep}`;
           const contractDataPath = `${this.env.config.paths.artifacts}${sep}${sourcePath}${sep}${name}.json`;
           const contractData = JSON.parse(
             fs.readFileSync(contractDataPath).toString()

src/tenderly/TenderlyService.ts

@@ -141,7 +141,7 @@ export class TenderlyService {
         return;
       }
 
-      if (responseData.contracts.length) {
+      if (!responseData.contracts?.length) {
         console.log(NO_NEW_CONTRACTS_VERIFIED_ERROR);
         return;
       }

src/tenderly/errors.ts

@@ -1,7 +1,7 @@
-import { PluginName } from "../index";
+const Plugin = "hardhat-tenderly";
 
-export const BYTECODE_MISMATCH_ERROR = `Error in ${PluginName}: Contract verification failed, bytecode mismatch detected. This can occur if compiler details or source is different compared to the deployed contract.`;
-export const NO_VERIFIABLE_CONTRACTS_ERROR = `${PluginName}: Contracts are not eligible for verification.`;
-export const NO_NEW_CONTRACTS_VERIFIED_ERROR = `${PluginName}: No new contracts have been verified.`;
-export const API_REQUEST_ERROR = `Error in ${PluginName}: Verification failed. There was an error during the API request, please contact support  with the above error.`;
+export const BYTECODE_MISMATCH_ERROR = `Error in ${Plugin}: Contract verification failed, bytecode mismatch detected. This can occur if compiler details or source is different compared to the deployed contract.`;
+export const NO_VERIFIABLE_CONTRACTS_ERROR = `${Plugin}: Contracts are not eligible for verification.`;
+export const NO_NEW_CONTRACTS_VERIFIED_ERROR = `${Plugin}: No new contracts have been verified.`;
+export const API_REQUEST_ERROR = `Error in ${Plugin}: Verification failed. There was an error during the API request, please contact support  with the above error.`;
 export const CONTRACTS_NOT_DETECTED = `"Could not detect any contracts inside hardhat project. Make sure you have some contracts under ./contracts directory."`;

src/tenderly/ethers/Contract.ts

@@ -29,11 +29,12 @@ export class TdlyContract {
 
   public async deployed(): Promise<Contract> {
     const contract = await this.nativeContract.deployed();
-
-    await this.tenderly.verify({
+    const contPair = {
       name: this.contractName,
       address: contract.address
-    });
+    };
+    await this.tenderly.persistArtifacts(contPair);
+    await this.tenderly.verify(contPair);
     return contract;
   }
 }

src/tenderly/types/utils.ts

@@ -16,6 +16,7 @@ export interface TenderlyConfig {
   username: string;
   forkNetwork: string;
   privateVerification?: boolean;
+  deploymentsDir?: string;
 }
 
 export interface Metadata {