chore: upgrade to latest version of viem and wagmi (#941)

.vitest/package.json

@@ -9,7 +9,7 @@
     "prool": "^0.0.15",
     "tar": "^7.4.1",
     "typescript-template": "*",
-    "viem": "2.8.6"
+    "viem": "2.20.0"
   },
   "dependencies": {
     "@aa-sdk/core": "^4.0.0-alpha.8"

aa-sdk/core/package.json

@@ -5,7 +5,7 @@
   "description": "viem based SDK that enables interactions with ERC-4337 Smart Accounts. ABIs are based off the definitions generated in @account-abstraction/contracts",
   "author": "Alchemy",
   "type": "module",
-  "main": "./dist/cjs/index.js",
+  "main": "./dist/esm/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "typings": "./dist/types/index.d.ts",
@@ -23,7 +23,7 @@
     ".": {
       "types": "./dist/types/index.d.ts",
       "import": "./dist/esm/index.js",
-      "default": "./dist/cjs/index.js"
+      "default": "./dist/esm/index.js"
     },
     "./package.json": "./package.json"
   },
@@ -32,11 +32,10 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "prebuild": "node --loader ts-node/esm ./inject-version.ts",
-    "build": "yarn clean && yarn build:cjs && yarn build:esm && yarn build:types",
-    "build:cjs": "tsc --project tsconfig.build.json --module commonjs --outDir ./dist/cjs --removeComments --verbatimModuleSyntax false && echo > ./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
-    "build:esm": "tsc --project tsconfig.build.json --module es2020 --outDir ./dist/esm --removeComments && echo > ./dist/esm/package.json '{\"type\":\"module\"}'",
-    "build:types": "tsc --project tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
+    "prebuild": "npx tsx ./inject-version.ts",
+    "build": "yarn clean && yarn build:esm && yarn build:types",
+    "build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
+    "build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
     "docs:gen": "npx ak-docgen generate --in ./src/index.ts --out ../../site/pages/reference/aa-sdk/core",
     "clean": "rm -rf ./dist",
     "test": "vitest",
@@ -53,11 +52,11 @@
   "dependencies": {
     "abitype": "^0.8.3",
     "eventemitter3": "^5.0.1",
-    "viem": "2.8.6",
+    "viem": "2.20.0",
     "zod": "^3.22.4"
   },
   "peerDependencies": {
-    "viem": "2.8.6"
+    "viem": "2.20.0"
   },
   "repository": {
     "type": "git",

aa-sdk/core/src/account/smartContractAccount.ts

@@ -118,7 +118,7 @@ export type SmartContractAccount<
     typedDataDefinition: TypedDataDefinition<typedData, primaryType>
   ) => Promise<Hex>;
   encodeUpgradeToAndCall: (params: UpgradeToAndCallParams) => Promise<Hex>;
-  getNonce(nonceKey?: bigint): Promise<bigint>;
+  getAccountNonce(nonceKey?: bigint): Promise<bigint>;
   getInitCode: () => Promise<Hex>;
   isAccountDeployed: () => Promise<boolean>;
   getFactoryAddress: () => Promise<Address>;
@@ -374,7 +374,7 @@ export async function toSmartContractAccount(
     if (deploymentState === DeploymentState.DEPLOYED) {
       return "0x";
     }
-    const contractCode = await client.getBytecode({
+    const contractCode = await client.getCode({
       address: accountAddress_,
     });
 
@@ -509,7 +509,7 @@ export async function toSmartContractAccount(
     encodeUpgradeToAndCall: encodeUpgradeToAndCall_,
     getEntryPoint: () => entryPoint,
     isAccountDeployed,
-    getNonce,
+    getAccountNonce: getNonce,
     signMessageWith6492,
     signTypedDataWith6492,
     getImplementationAddress,

aa-sdk/core/src/actions/smartAccount/internal/initUserOperation.ts

@@ -62,7 +62,7 @@ export async function _initUserOperation<
 
   const signature = account.getDummySignature();
 
-  const nonce = account.getNonce(overrides?.nonceKey);
+  const nonce = account.getAccountNonce(overrides?.nonceKey);
 
   const struct =
     entryPoint.version === "0.6.0"

aa-sdk/core/src/index.ts

@@ -1,6 +1,5 @@
 export type { Abi } from "abitype";
 export type { Address, HttpTransport } from "viem";
-export * as chains from "viem/chains";
 
 export { EntryPointAbi_v6 } from "./abis/EntryPointAbi_v6.js";
 export { EntryPointAbi_v7 } from "./abis/EntryPointAbi_v7.js";

aa-sdk/ethers/package.json

@@ -5,7 +5,7 @@
   "description": "Ethers.js wrapper for @aa-sdk/core",
   "author": "Alchemy",
   "type": "module",
-  "main": "./dist/cjs/index.js",
+  "main": "./dist/esm/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "typings": "./dist/types/index.d.ts",
@@ -23,7 +23,7 @@
     ".": {
       "types": "./dist/types/index.d.ts",
       "import": "./dist/esm/index.js",
-      "default": "./dist/cjs/index.js"
+      "default": "./dist/esm/index.js"
     },
     "./package.json": "./package.json"
   },
@@ -32,10 +32,9 @@
     "registry": "https://registry.npmjs.org/"
   },
   "scripts": {
-    "build": "yarn clean && yarn build:cjs && yarn build:esm && yarn build:types",
-    "build:cjs": "tsc --project tsconfig.build.json --module commonjs --outDir ./dist/cjs --removeComments --verbatimModuleSyntax false && echo > ./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
-    "build:esm": "tsc --project tsconfig.build.json --module es2020 --outDir ./dist/esm --removeComments && echo > ./dist/esm/package.json '{\"type\":\"module\"}'",
-    "build:types": "tsc --project tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
+    "build": "yarn clean && yarn build:esm && yarn build:types",
+    "build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
+    "build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
     "docs:gen": "npx ak-docgen generate --in ./src/index.ts --out ../../site/pages/reference/aa-sdk/ethers",
     "clean": "rm -rf ./dist",
     "test": "vitest",
@@ -60,10 +59,10 @@
     "@ethersproject/keccak256": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",
     "@ethersproject/wallet": "^5.7.0",
-    "viem": "2.8.6"
+    "viem": "2.20.0"
   },
   "peerDependencies": {
-    "viem": "2.8.6"
+    "viem": "2.20.0"
   },
   "repository": {
     "type": "git",

account-kit/core/package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "private": false,
   "type": "module",
-  "main": "./dist/cjs/index.js",
+  "main": "./dist/esm/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "typings": "./dist/types/index.d.ts",
@@ -24,16 +24,15 @@
     ".": {
       "types": "./dist/types/index.d.ts",
       "import": "./dist/esm/index.js",
-      "default": "./dist/cjs/index.js"
+      "default": "./dist/esm/index.js"
     },
     "./package.json": "./package.json"
   },
   "scripts": {
-    "prebuild": "node --loader ts-node/esm ./inject-version.ts",
-    "build": "yarn clean && yarn build:cjs && yarn build:esm && yarn build:types",
-    "build:cjs": "tsc --project tsconfig.build.json --module commonjs --outDir ./dist/cjs --removeComments --verbatimModuleSyntax false && echo > ./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
-    "build:esm": "tsc --project tsconfig.build.json --module es2020 --outDir ./dist/esm --removeComments && echo > ./dist/esm/package.json '{\"type\":\"module\"}'",
-    "build:types": "tsc --project tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
+    "prebuild": "npx tsx ./inject-version.ts",
+    "build": "yarn clean && yarn build:esm && yarn build:types",
+    "build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
+    "build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
     "clean": "rm -rf ./dist",
     "docs:gen": "npx ak-docgen generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/core",
     "test": "vitest --passWithNoTests",
@@ -49,17 +48,18 @@
     "@account-kit/infra": "^4.0.0-alpha.12",
     "@account-kit/signer": "^4.0.0-alpha.12",
     "@account-kit/smart-contracts": "^4.0.0-alpha.12",
-    "@wagmi/core": "^2.9.8",
     "js-cookie": "^3.0.5",
-    "viem": "2.8.6",
+    "wagmi": "2.12.7",
+    "viem": "2.20.0",
     "zod": "^3.22.4",
     "zustand": "^4.5.2"
   },
   "peerDependencies": {
-    "viem": "2.8.6"
+    "wagmi": "2.12.7",
+    "viem": "2.20.0"
   },
   "resolutions": {
-    "viem": "2.8.6"
+    "viem": "2.20.0"
   },
   "publishConfig": {
     "access": "public",

account-kit/infra/package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "private": false,
   "type": "module",
-  "main": "./dist/cjs/index.js",
+  "main": "./dist/esm/index.js",
   "module": "./dist/esm/index.js",
   "types": "./dist/types/index.d.ts",
   "typings": "./dist/types/index.d.ts",
@@ -24,16 +24,15 @@
     ".": {
       "types": "./dist/types/index.d.ts",
       "import": "./dist/esm/index.js",
-      "default": "./dist/cjs/index.js"
+      "default": "./dist/esm/index.js"
     },
     "./package.json": "./package.json"
   },
   "scripts": {
-    "prebuild": "node --loader ts-node/esm ./inject-version.ts",
-    "build": "yarn clean && yarn build:cjs && yarn build:esm && yarn build:types",
-    "build:cjs": "tsc --project tsconfig.build.json --module commonjs --outDir ./dist/cjs --removeComments --verbatimModuleSyntax false && echo > ./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
-    "build:esm": "tsc --project tsconfig.build.json --module es2020 --outDir ./dist/esm --removeComments && echo > ./dist/esm/package.json '{\"type\":\"module\"}'",
-    "build:types": "tsc --project tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
+    "prebuild": "npx tsx ./inject-version.ts",
+    "build": "yarn clean && yarn build:esm && yarn build:types",
+    "build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
+    "build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
     "docs:gen": "npx ak-docgen generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/infra",
     "clean": "rm -rf ./dist",
     "test": "vitest",
@@ -48,14 +47,14 @@
   "dependencies": {
     "@aa-sdk/core": "^4.0.0-alpha.12",
     "eventemitter3": "^5.0.1",
-    "viem": "2.8.6",
+    "viem": "2.20.0",
     "zod": "^3.22.4"
   },
   "peerDependencies": {
-    "viem": "2.8.6"
+    "viem": "2.20.0"
   },
   "resolutions": {
-    "viem": "2.8.6"
+    "viem": "2.20.0"
   },
   "publishConfig": {
     "access": "public",

account-kit/infra/src/client/decorators/alchemyEnhancedApis.ts

@@ -31,17 +31,18 @@ export type AlchemyEnhancedApis = {
  * @param {Alchemy} alchemy The Alchemy instance containing the SDK client
  * @returns {(client: AlchemySmartAccountClient) => AlchemyEnhancedApis} A client decorator for Alchemy Smart Account clients that adds the enhanced API methods
  */
-export const alchemyEnhancedApiActions =
-  (alchemy: Alchemy) =>
-  <
-    TTransport extends Transport = Transport,
-    TChain extends Chain | undefined = Chain | undefined,
-    TAccount extends SmartContractAccount | undefined =
-      | SmartContractAccount
-      | undefined
-  >(
-    client: AlchemySmartAccountClient<TTransport, TChain, TAccount>
-  ): AlchemyEnhancedApis => {
+export function alchemyEnhancedApiActions(
+  alchemy: Alchemy
+): <
+  TTransport extends Transport = Transport,
+  TChain extends Chain | undefined = Chain | undefined,
+  TAccount extends SmartContractAccount | undefined =
+    | SmartContractAccount
+    | undefined
+>(
+  client: AlchemySmartAccountClient<TTransport, TChain, TAccount>
+) => AlchemyEnhancedApis {
+  return (client) => {
     const alchemySdk = AlchemySdkClientSchema.parse(alchemy);
 
     if (client.transport.type === "http") {
@@ -69,3 +70,4 @@ export const alchemyEnhancedApiActions =
       config: alchemySdk.config,
     };
   };
+}

account-kit/infra/src/client/isAlchemySmartAccountClient.ts

@@ -17,18 +17,18 @@ import type { AlchemySmartAccountClient } from "./smartAccountClient";
  * @param {Client<TTransport, TChain, TAccount>} client The client instance to be checked
  * @returns {boolean} `true` if the client is an Alchemy Smart Account Client, otherwise `false`
  */
-export const isAlchemySmartAccountClient = <
+export function isAlchemySmartAccountClient<
   TTransport extends Transport = Transport,
   TChain extends Chain | undefined = Chain | undefined,
   TAccount extends SmartContractAccount | undefined =
     | SmartContractAccount
     | undefined
 >(
   client: Client<TTransport, TChain, TAccount>
-): client is AlchemySmartAccountClient<TTransport, TChain, TAccount> => {
+): client is AlchemySmartAccountClient<TTransport, TChain, TAccount> {
   // TODO: the goal of this check is to make sure that the client supports certain RPC methods
   // we should probably do this by checking the client's transport and configured URL, since alchemy
   // clients have to be RPC clients. this is difficult to do though because the transport might
   // point to a proxy url :/
   return isSmartAccountClient(client);
-};
+}

account-kit/plugingen/package.json

@@ -34,10 +34,10 @@
     "plugingen": "./dist/esm/cli.js"
   },
   "scripts": {
-    "prebuild": "node --loader ts-node/esm ./inject-version.ts",
+    "prebuild": "npx tsx ./inject-version.ts",
     "build": "yarn clean && yarn build:esm && yarn build:types",
-    "build:esm": "tsc --project tsconfig.build.json --module es2020 --outDir ./dist/esm --removeComments && echo > ./dist/esm/package.json '{\"type\":\"module\"}'",
-    "build:types": "tsc --project tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
+    "build:esm": "tsc --project tsconfig.build.json --outDir ./dist/esm",
+    "build:types": "tsc --project tsconfig.build.json --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
     "postbuild": "chmod +x ./dist/esm/cli.js",
     "clean": "rm -rf ./dist"
   },
@@ -73,10 +73,10 @@
     "pathe": "^1.1.2",
     "picocolors": "^1.0.0",
     "prettier": "^3.2.5",
-    "viem": "2.8.6",
+    "viem": "2.20.0",
     "zod": "^3.22.4"
   },
   "peerDependencies": {
-    "viem": "2.8.6"
+    "viem": "2.20.0"
   }
 }

account-kit/plugingen/src/commands/generate/phases/plugin-generator/get-contract-gen.ts

@@ -23,7 +23,7 @@ export const GetContractGenPhase: Phase = async (input) => {
         address: address || addresses[client.chain.id],
         abi: ${pluginConfig.name}Abi,
         client: client,
-      });
+      }) as GetContractReturnType<typeof ${pluginConfig.name}Abi, PublicClient, Address>;
   }`);
 
   return input;