Version packages

Tenderly · Nov 9, 2023 · c8f7558 · c8f7558
2 parents 49b8184 + 0412ece
commit c8f7558
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 18 deletions.
diff --git a/.changeset/chatty-feet-walk.md b/.changeset/chatty-feet-walk.md
@@ -0,0 +1,5 @@
+---
+"@tenderly/hardhat-tenderly": minor
+---
+
+Return valid display link
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -0,0 +1,11 @@
+{
+  "mode": "pre",
+  "tag": "beta",
+  "initialVersions": {
+    "tenderly": "0.5.3-beta.1",
+    "@tenderly/hardhat-tenderly": "1.7.5-beta.1"
+  },
+  "changesets": [
+    "chatty-feet-walk"
+  ]
+}
diff --git a/examples/contract-verification/package.json b/examples/contract-verification/package.json
@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "@nomiclabs/hardhat-ethers": "^2.1.0",
-    "@tenderly/hardhat-tenderly": "^1.5.3",
+    "@tenderly/hardhat-tenderly": "^1.8.0",
     "dotenv": "^16.0.1",
     "hardhat": "^2.10.2"
   }

diff --git a/examples/contract-verification/yarn.lock b/examples/contract-verification/yarn.lock
@@ -783,20 +783,20 @@
     "@sentry/types" "5.30.0"
     tslib "^1.9.3"
 
-"@tenderly/hardhat-tenderly@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@tenderly/hardhat-tenderly/-/hardhat-tenderly-1.3.2.tgz#9ee69ba1fb8650d18160c637e8e487d938f6dcea"
-  integrity sha512-0kE0gv8RIu0N5JXKCCfYcydsMgGgj8z3qCvbeD/ynBKwOBvbFB+NZFRyTHNopbeaUKO7Q3bGFau8vS1B0EWS0g==
+"@tenderly/hardhat-tenderly@^1.5.3":
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/@tenderly/hardhat-tenderly/-/hardhat-tenderly-1.7.7.tgz#b320ee6bea3779e4781eb0299a3a816cbdc83def"
+  integrity sha512-p/jLzRPpoD7J0LGvUFEQjgniDzmP5AzfTgy41qqzyjhOsW0voe7wZI8lXjadl5MEr7rAXN1iH3VncT13qG6+Zw==
   dependencies:
     "@ethersproject/bignumber" "^5.7.0"
     "@nomiclabs/hardhat-ethers" "^2.1.1"
     axios "^0.27.2"
     ethers "^5.7.0"
     fs-extra "^10.1.0"
-    hardhat "^2.10.2"
     hardhat-deploy "^0.11.14"
     js-yaml "^4.1.0"
-    tenderly "^0.0.3"
+    tenderly "^0.5.3"
+    tslog "^4.3.1"
 
 "@tsconfig/node10@^1.0.7":
   version "1.0.9"
@@ -4039,10 +4039,10 @@ table@^6.8.0:
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
 
-tenderly@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tenderly/-/tenderly-0.0.3.tgz#8c85e287e080073502420d5c6f13f4762d0f59cd"
-  integrity sha512-dVf2uxrIOeLDRNDEXcQlV2xJt50TIx8zGQKlNj1deYTV3FYu2L0zheHBHaDU12GqAff2iiGYk+fKqFkK0bB0+w==
+tenderly@^0.5.3:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/tenderly/-/tenderly-0.5.3.tgz#115653ff33fc33e3be41ab7dd669fdbe0f28a6fb"
+  integrity sha512-sR+sbZKZzt3b2+moXJsrkBvbava1/4mGulIfuZw8bwr2OpCH8N00dME1t89JC8RjVnQjy4VewVFHyWANdn5zYQ==
   dependencies:
     axios "^0.27.2"
     cli-table3 "^0.6.2"
@@ -4052,6 +4052,7 @@ tenderly@^0.0.3:
     js-yaml "^4.1.0"
     open "^8.4.0"
     prompts "^2.4.2"
+    tslog "^4.4.0"
 
 text-table@^0.2.0:
   version "0.2.0"
@@ -4126,6 +4127,11 @@ tslib@^1.8.1, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
+tslog@^4.3.1, tslog@^4.4.0:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/tslog/-/tslog-4.9.2.tgz#35de3a073784dfe3849caeaa028010c7a62b7f4a"
+  integrity sha512-wBM+LRJoNl34Bdu8mYEFxpvmOUedpNUwMNQB/NcuPIZKwdDde6xLHUev3bBjXQU7gdurX++X/YE7gLH8eXYsiQ==
+
 tsort@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/tsort/-/tsort-0.0.1.tgz#e2280f5e817f8bf4275657fd0f9aebd44f5a2786"

diff --git a/packages/tenderly-core/CHANGELOG.md b/packages/tenderly-core/CHANGELOG.md
@@ -1,17 +1,25 @@
 # tenderly
 
-## 0.5.3-beta.1
+## 0.5.3
 
 ### Patch Changes
 
-- Fixed prebuild.js script
+- [#147](https://github.com/Tenderly/hardhat-tenderly/pull/147) [`4326062`](https://github.com/Tenderly/hardhat-tenderly/commit/4326062a176d220ead5cdc810d8e49f903aaa9f6) Thanks [@dule-git](https://github.com/dule-git)! - Added x-user-agent header to request
+
+## 0.5.3-beta.1
 
 ## 0.5.3-beta.0
 
 ### Patch Changes
 
 - Added x-user-agent header
 
+## 0.5.2
+
+### Patch Changes
+
+- Fixed prebuild.js script
+
 ## 0.5.2-beta.1
 
 ### Patch Changes

diff --git a/packages/tenderly-core/src/internal/core/services/TenderlyService.ts b/packages/tenderly-core/src/internal/core/services/TenderlyService.ts
@@ -441,7 +441,10 @@ export class TenderlyService {
       if (response.results.verified_contracts !== undefined && response.results.verified_contracts !== null) {
         for (const verifiedContract of response.results.verified_contracts) {
           const contractLink = `${TENDERLY_DASHBOARD_BASE_URL}/${username}/${tenderlyProject}/fork/${forkID}`;
-          const logMsg = `Contract ${verifiedContract.address} verified. You can view the contract at the fork: ${contractLink}`;
+          let logMsg = `Contract ${verifiedContract.address} verified. You can view the contract at the fork: ${contractLink}`;
+          if (response.display_link != undefined && response.display_link != '') {
+            logMsg = `Contract ${verifiedContract.address} verified. You can view the contract at: ${response.display_link}`;
+          }
           console.log(logMsg);
           logger.trace(logMsg);
         }

diff --git a/packages/tenderly-core/src/internal/core/services/hardhat-tenderly-version.ts b/packages/tenderly-core/src/internal/core/services/hardhat-tenderly-version.ts
@@ -1,2 +1,2 @@
 // autogenerated by prebuild.js
-  export const HARDHAT_TENDERLY_VERSION = '1.7.5-beta.0';
+  export const HARDHAT_TENDERLY_VERSION = '1.8.0';
diff --git a/packages/tenderly-hardhat/CHANGELOG.md b/packages/tenderly-hardhat/CHANGELOG.md
@@ -1,17 +1,43 @@
 # @tenderly/hardhat-tenderly
 
-## 1.7.5-beta.1
+## 1.8.0-beta.2
+
+### Minor Changes
+
+- Return valid display link
+
+## 1.7.7
 
 ### Patch Changes
 
-- Fixed prebuild.js script
+- [#151](https://github.com/Tenderly/hardhat-tenderly/pull/151) [`1f5ac79`](https://github.com/Tenderly/hardhat-tenderly/commit/1f5ac79b8ad7964939a83d66c5c46f5a22712168) Thanks [@dule-git](https://github.com/dule-git)! - When looking for the chainId for the network to verify on, firstly look in the network configuration that the user specifed, then look at the base that tenderly has.
+
+## 1.7.6
+
+### Patch Changes
+
+- [#149](https://github.com/Tenderly/hardhat-tenderly/pull/149) [`c1d43a8`](https://github.com/Tenderly/hardhat-tenderly/commit/c1d43a85e8dbf9e1953f8ba5174094cd1553ef02) Thanks [@dule-git](https://github.com/dule-git)! - Enable clients to specify their own `chainId`
+
+## 1.7.5
+
+### Patch Changes
+
+- [#147](https://github.com/Tenderly/hardhat-tenderly/pull/147) [`4326062`](https://github.com/Tenderly/hardhat-tenderly/commit/4326062a176d220ead5cdc810d8e49f903aaa9f6) Thanks [@dule-git](https://github.com/dule-git)! - Added x-user-agent header to request
+
+## 1.7.5-beta.1
 
 ## 1.7.5-beta.0
 
 ### Patch Changes
 
 - Added x-user-agent header
 
+## 1.7.4
+
+### Patch Changes
+
+- Fixed prebuild.js script
+
 ## 1.7.3-beta.2
 
 ### Patch Changes

diff --git a/packages/tenderly-hardhat/package.json b/packages/tenderly-hardhat/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "homepage": "https://tenderly.co",
   "description": "Hardhat plugin for integration with Tenderly",
-  "version": "1.7.5-beta.1",
+  "version": "1.8.0-beta.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": {

diff --git a/packages/tenderly-hardhat/src/utils/util.ts b/packages/tenderly-hardhat/src/utils/util.ts
@@ -59,6 +59,10 @@ export const makeVerifyContractsRequest = async (
     }
     if (chainId === undefined && isTenderlyNetworkName(network) && platformID !== undefined) {
       chainId = platformID;
+    } else if (hre.network?.config?.chainId !== undefined) {
+      chainId = hre.network.config.chainId.toString();
+    } else if (NETWORK_NAME_CHAIN_ID_MAP[network.toLowerCase()] !== undefined) {
+      chainId = NETWORK_NAME_CHAIN_ID_MAP[network.toLowerCase()].toString();
     }
     logger.trace(`ChainId for network '${network}' is ${chainId}`);