Upgrade hardhat-viem to support viem@2

NomicFoundation · Feb 15, 2024 · bc34536 · bc34536
1 parent 5f0e42d
commit bc34536
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 14 deletions.
diff --git a/.changeset/proud-peas-sort.md b/.changeset/proud-peas-sort.md
@@ -0,0 +1,5 @@
+---
+"@nomicfoundation/hardhat-viem": patch
+---
+
+Upgraded hardhat-viem to support viem@2
diff --git a/packages/hardhat-viem/package.json b/packages/hardhat-viem/package.json
@@ -66,12 +66,12 @@
     "sinon": "^9.0.0",
     "ts-node": "^10.8.0",
     "typescript": "~5.0.0",
-    "viem": "^1.15.1"
+    "viem": "^2.7.6"
   },
   "peerDependencies": {
     "hardhat": "^2.17.0",
     "typescript": "~5.0.0",
-    "viem": "^1.15.1"
+    "viem": "^2.7.6"
   },
   "dependencies": {
     "abitype": "^0.9.8",

diff --git a/packages/hardhat-viem/src/internal/contracts.ts b/packages/hardhat-viem/src/internal/contracts.ts
@@ -225,8 +225,10 @@ async function innerGetContractAt(
   const viem = await import("viem");
   const contract = viem.getContract({
     address,
-    publicClient,
-    walletClient,
+    client: {
+      public: publicClient,
+      wallet: walletClient,
+    },
     abi: contractAbi,
   });
 

diff --git a/packages/hardhat-viem/src/types.ts b/packages/hardhat-viem/src/types.ts
@@ -42,8 +42,10 @@ export type GetContractReturnType<
   TAbi extends viemT.Abi | readonly unknown[] = viemT.Abi
 > = viemT.GetContractReturnType<
   TAbi,
-  PublicClient,
-  WalletClient,
+  {
+    public: PublicClient;
+    wallet: WalletClient;
+  },
   viemT.Address
 >;
 

diff --git a/packages/hardhat-viem/test/integration.ts b/packages/hardhat-viem/test/integration.ts
@@ -64,10 +64,10 @@ describe("Integration tests", function () {
         const fromAddress = fromWalletClient.account.address;
         const toAddress = toWalletClient.account.address;
 
-        const fromBalanceBefore: bigint = await publicClient.getBalance({
+        const fromBalanceBefore = await publicClient.getBalance({
           address: fromAddress,
         });
-        const toBalanceBefore: bigint = await publicClient.getBalance({
+        const toBalanceBefore = await publicClient.getBalance({
           address: toAddress,
         });
 
@@ -79,10 +79,10 @@ describe("Integration tests", function () {
         const receipt = await publicClient.waitForTransactionReceipt({ hash });
         const transactionFee = receipt.gasUsed * receipt.effectiveGasPrice;
 
-        const fromBalanceAfter: bigint = await publicClient.getBalance({
+        const fromBalanceAfter = await publicClient.getBalance({
           address: fromAddress,
         });
-        const toBalanceAfter: bigint = await publicClient.getBalance({
+        const toBalanceAfter = await publicClient.getBalance({
           address: toAddress,
         });
 

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml