thirdweb 5.86.2 → 5.86.4

package/dist/types/utils/bytecode/resolveImplementation.d.ts

@@ -1,4 +1,4 @@
-import type { ThirdwebContract } from "../../contract/contract.js";
+import { type ThirdwebContract } from "../../contract/contract.js";
 import type { Hex } from "../encoding/hex.js";
 /**
  * Resolves the implementation address and bytecode for a given proxy contract.

package/dist/types/utils/bytecode/resolveImplementation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolveImplementation.d.ts","sourceRoot":"","sources":["../../../../src/utils/bytecode/resolveImplementation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAKnE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAQ9C;;;;;;;;;;GAUG;AACH,wBAAsB,qBAAqB,CAEzC,QAAQ,EAAE,gBAAgB,CAAC,GAAG,CAAC,GAC9B,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,GAAG,CAAA;CAAE,CAAC,CAuD7C"}
+{"version":3,"file":"resolveImplementation.d.ts","sourceRoot":"","sources":["../../../../src/utils/bytecode/resolveImplementation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,gBAAgB,EAAe,MAAM,4BAA4B,CAAC;AAKhF,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAC;AAQ9C;;;;;;;;;;GAUG;AACH,wBAAsB,qBAAqB,CAEzC,QAAQ,EAAE,gBAAgB,CAAC,GAAG,CAAC,GAC9B,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,GAAG,CAAA;CAAE,CAAC,CA4D7C"}

package/dist/types/utils/extensions/airdrop/hash-entry-erc1155.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash-entry-erc1155.d.ts","sourceRoot":"","sources":["../../../../../src/utils/extensions/airdrop/hash-entry-erc1155.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEvD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE;IAC9C,KAAK,EAAE,oBAAoB,CAAC;CAC7B,0BAWA"}
+{"version":3,"file":"hash-entry-erc1155.d.ts","sourceRoot":"","sources":["../../../../../src/utils/extensions/airdrop/hash-entry-erc1155.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAEvD,wBAAsB,gBAAgB,CAAC,OAAO,EAAE;IAC9C,KAAK,EAAE,oBAAoB,CAAC;CAC7B,0BAWA"}

package/dist/types/utils/extensions/airdrop/hash-entry-erc20.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash-entry-erc20.d.ts","sourceRoot":"","sources":["../../../../../src/utils/extensions/airdrop/hash-entry-erc20.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,wBAAsB,cAAc,CAAC,OAAO,EAAE;IAC5C,KAAK,EAAE,kBAAkB,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,0BAeA"}
+{"version":3,"file":"hash-entry-erc20.d.ts","sourceRoot":"","sources":["../../../../../src/utils/extensions/airdrop/hash-entry-erc20.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAErD,wBAAsB,cAAc,CAAC,OAAO,EAAE;IAC5C,KAAK,EAAE,kBAAkB,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,0BAeA"}

package/dist/types/utils/extensions/airdrop/hash-entry-erc721.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash-entry-erc721.d.ts","sourceRoot":"","sources":["../../../../../src/utils/extensions/airdrop/hash-entry-erc721.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,wBAAsB,eAAe,CAAC,OAAO,EAAE;IAAE,KAAK,EAAE,mBAAmB,CAAA;CAAE,0BAO5E"}
+{"version":3,"file":"hash-entry-erc721.d.ts","sourceRoot":"","sources":["../../../../../src/utils/extensions/airdrop/hash-entry-erc721.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEtD,wBAAsB,eAAe,CAAC,OAAO,EAAE;IAAE,KAAK,EAAE,mBAAmB,CAAA;CAAE,0BAO5E"}

package/dist/types/utils/extensions/drops/hash-entry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hash-entry.d.ts","sourceRoot":"","sources":["../../../../../src/utils/extensions/drops/hash-entry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAOhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,wBAAsB,SAAS,CAAC,OAAO,EAAE;IACvC,KAAK,EAAE,aAAa,CAAC;IACrB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB,0BAsCA"}
+{"version":3,"file":"hash-entry.d.ts","sourceRoot":"","sources":["../../../../../src/utils/extensions/drops/hash-entry.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAQhE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,wBAAsB,SAAS,CAAC,OAAO,EAAE;IACvC,KAAK,EAAE,aAAa,CAAC;IACrB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,cAAc,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACvB,0BAsCA"}

package/dist/types/version.d.ts

@@ -1,2 +1,2 @@
-export declare const version = "5.86.2";
+export declare const version = "5.86.4";
 //# sourceMappingURL=version.d.ts.map

package/dist/types/wallets/eip5792/get-capabilities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-capabilities.d.ts","sourceRoot":"","sources":["../../../../src/wallets/eip5792/get-capabilities.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAI1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAE/E,MAAM,MAAM,sBAAsB,CAAC,EAAE,SAAS,QAAQ,GAAG,QAAQ,IAAI;IACnE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAC1C,wBAAwB,CAAC,kBAAkB,EAAE,MAAM,CAAC,CACrD,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,eAAe,CAAC,KAAK,CAAC,EAAE,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAC1E,MAAM,GACP,EAAE,sBAAsB,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAoD7D"}
+{"version":3,"file":"get-capabilities.d.ts","sourceRoot":"","sources":["../../../../src/wallets/eip5792/get-capabilities.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAI1D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAGtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAE/E,MAAM,MAAM,sBAAsB,CAAC,EAAE,SAAS,QAAQ,GAAG,QAAQ,IAAI;IACnE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,QAAQ,CAC1C,wBAAwB,CAAC,kBAAkB,EAAE,MAAM,CAAC,CACrD,CAAC;AAEF;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAsB,eAAe,CAAC,KAAK,CAAC,EAAE,SAAS,QAAQ,GAAG,QAAQ,EAAE,EAC1E,MAAM,GACP,EAAE,sBAAsB,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAoD7D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thirdweb",
-  "version": "5.86.2",
+  "version": "5.86.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/thirdweb-dev/js.git#main"
@@ -228,7 +228,7 @@
     "mipd": "0.0.7",
     "ox": "0.4.2",
     "uqr": "0.1.2",
-    "viem": "2.21.55"
+    "viem": "2.22.15"
   },
   "peerDependencies": {
     "@aws-sdk/client-lambda": "^3",

package/src/adapters/viem.ts

@@ -19,6 +19,7 @@ import { getRpcClient } from "../rpc/rpc.js";
 import { estimateGas } from "../transaction/actions/estimate-gas.js";
 import { sendTransaction } from "../transaction/actions/send-transaction.js";
 import { prepareTransaction } from "../transaction/prepare-transaction.js";
+import { getAddress } from "../utils/address.js";
 import type { Account } from "../wallets/interfaces/wallet.js";
 
 /**
@@ -201,7 +202,7 @@ export async function toViemContract<const TAbi extends Abi>(options: {
   thirdwebContract: ThirdwebContract<TAbi>;
 }): Promise<GetContractReturnType<TAbi>> {
   return {
-    address: options.thirdwebContract.address,
+    address: getAddress(options.thirdwebContract.address),
     abi: await resolveContractAbi(options.thirdwebContract),
   };
 }
@@ -310,7 +311,7 @@ function toViemWalletClient(options: ToViemWalletClientOptions): WalletClient {
 
   return createWalletClient({
     transport,
-    account: account.address,
+    account: getAddress(account.address),
     chain: viemChain,
     key: "thirdweb-wallet",
   });

package/src/auth/verify-hash.ts

@@ -9,6 +9,7 @@ import { type ThirdwebContract, getContract } from "../contract/contract.js";
 import { isValidSignature } from "../extensions/erc1271/__generated__/isValidSignature/read/isValidSignature.js";
 import { eth_call } from "../rpc/actions/eth_call.js";
 import { getRpcClient } from "../rpc/rpc.js";
+import type { Address } from "../utils/address.js";
 import { isZkSyncChain } from "../utils/any-evm/zksync/isZkSyncChain.js";
 import { isContractDeployed } from "../utils/bytecode/is-contract-deployed.js";
 import { fromBytes } from "../utils/encoding/from-bytes.js";
@@ -27,7 +28,8 @@ export type VerifyHashParams = {
   };
 };
 
-const ZKSYNC_VALIDATOR_ADDRESS = "0xfB688330379976DA81eB64Fe4BF50d7401763B9C";
+const ZKSYNC_VALIDATOR_ADDRESS: Address =
+  "0xfB688330379976DA81eB64Fe4BF50d7401763B9C";
 
 /**
  * @description Verify that an address created the provided signature for a given hash using [ERC-6492](https://eips.ethereum.org/EIPS/eip-6492). This function is interoperable with all wallet types, including EOAs.
@@ -120,7 +122,7 @@ export async function verifyHash({
   })();
 
   let verificationData: {
-    to?: string;
+    to?: Address;
     data: Hex;
   };
 

package/src/chains/chain-definitions/abstract.ts

@@ -0,0 +1,16 @@
+import { defineChain } from "../utils.js";
+
+/**
+ * @chain
+ */
+export const abstract = /* @__PURE__ */ defineChain({
+  id: 2741,
+  name: "Abstract",
+  nativeCurrency: { name: "Ether", symbol: "ETH", decimals: 18 },
+  blockExplorers: [
+    {
+      name: "Abstract Block Explorer",
+      url: "https://explorer.abs.xyz",
+    },
+  ],
+});

package/src/contract/actions/get-bytecode.ts

@@ -1,10 +1,9 @@
-import type { Abi } from "abitype";
 import { eth_getCode } from "../../rpc/actions/eth_getCode.js";
 import { getRpcClient } from "../../rpc/rpc.js";
 import type { Hex } from "../../utils/encoding/hex.js";
 import type { ThirdwebContract } from "../contract.js";
 
-const BYTECODE_CACHE = new WeakMap<ThirdwebContract<Abi>, Promise<Hex>>();
+const BYTECODE_CACHE = new WeakMap<ThirdwebContract, Promise<Hex>>();
 
 /**
  * Retrieves the bytecode of a contract.
@@ -17,9 +16,7 @@ const BYTECODE_CACHE = new WeakMap<ThirdwebContract<Abi>, Promise<Hex>>();
  * ```
  * @contract
  */
-export function getBytecode<abi extends Abi>(
-  contract: ThirdwebContract<abi>,
-): Promise<Hex> {
+export function getBytecode(contract: ThirdwebContract): Promise<Hex> {
   if (BYTECODE_CACHE.has(contract)) {
     return BYTECODE_CACHE.get(contract) as Promise<Hex>;
   }

package/src/contract/actions/resolve-abi.ts

@@ -1,7 +1,7 @@
 import { type Abi, formatAbi, parseAbi } from "abitype";
 import { download } from "../../storage/download.js";
 import { getClientFetch } from "../../utils/fetch.js";
-import type { ThirdwebContract } from "../contract.js";
+import { type ThirdwebContract, getContract } from "../contract.js";
 
 const ABI_RESOLUTION_CACHE = new WeakMap<ThirdwebContract<Abi>, Promise<Abi>>();
 
@@ -419,10 +419,10 @@ async function getAbisForPlugins(
 ): Promise<Abi[]> {
   return Promise.all(
     options.plugins.map((pluginAddress) => {
-      const newContract = {
+      const newContract = getContract({
         ...options.contract,
         address: pluginAddress,
-      };
+      });
       // if we have a method passed in that tells us how to resove the sub-api, use that
       if (options.resolveSubAbi) {
         return options.resolveSubAbi(newContract);

package/src/contract/contract.ts

@@ -21,7 +21,7 @@ export type ContractOptions<
  */
 export type ThirdwebContract<
   abi extends Abi = [],
-  address extends string = string,
+  address extends string = `0x${string}`,
 > = Readonly<ContractOptions<abi, address>>;
 
 /**

package/src/contract/deployment/zksync/zkDeployDeterministic.ts

@@ -50,11 +50,13 @@ export async function zkDeployContractDeterministic(
     create2FactoryAddress,
     salt: options.salt,
   });
-  const deployed = await isContractDeployed({
-    address: predictedAddress,
-    chain: options.chain,
-    client: options.client,
-  });
+  const deployed = await isContractDeployed(
+    getContract({
+      address: predictedAddress,
+      chain: options.chain,
+      client: options.client,
+    }),
+  );
   if (!deployed) {
     // check if bytecodehash is known
     const knownCodesStorageContract = getContract({

package/src/contract/deployment/zksync/zkDeployProxy.ts

@@ -8,7 +8,7 @@ import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed
 import { resolvePromisedValue } from "../../../utils/promise/resolve-promised-value.js";
 import { randomBytesHex } from "../../../utils/random.js";
 import type { ClientAndChainAndAccount } from "../../../utils/types.js";
-import type { ThirdwebContract } from "../../contract.js";
+import { type ThirdwebContract, getContract } from "../../contract.js";
 import { zkDeployContractDeterministic } from "./zkDeployDeterministic.js";
 
 /**
@@ -28,11 +28,13 @@ export async function zkDeployProxy(
   if (!implementationAddress) {
     throw new Error("initializeTransaction must have a 'to' field set");
   }
-  const deployed = await isContractDeployed({
-    address: implementationAddress,
-    chain: options.chain,
-    client: options.client,
-  });
+  const deployed = await isContractDeployed(
+    getContract({
+      address: implementationAddress,
+      chain: options.chain,
+      client: options.client,
+    }),
+  );
   if (!deployed) {
     throw new Error(
       `Implementation contract at ${implementationAddress} is not deployed`,

package/src/event/actions/get-events.ts

@@ -20,6 +20,7 @@ import {
   eth_getLogs,
 } from "../../rpc/actions/eth_getLogs.js";
 import { getRpcClient } from "../../rpc/rpc.js";
+import { getAddress } from "../../utils/address.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import { type PreparedEvent, prepareEvent } from "../prepare-event.js";
 import { isAbiEvent } from "../utils.js";
@@ -168,11 +169,11 @@ export async function getContractEvents<
       ? // if we have events passed in then we use those
         events.map((e) => ({
           ...restParams,
-          address: contract?.address,
+          address: getAddress(contract.address),
           topics: e.topics,
         }))
       : // otherwise we want "all" events (aka not pass any topics at all)
-        [{ ...restParams, address: contract?.address }];
+        [{ ...restParams, address: getAddress(contract.address) }];
 
   const logs = await Promise.all(
     logsParams.map((ethLogParams) => eth_getLogs(rpcRequest, ethLogParams)),

package/src/exports/chains.ts

@@ -72,6 +72,7 @@ export { frameTestnet } from "../chains/chain-definitions/frame-testnet.js";
 export { hokumTestnet } from "../chains/chain-definitions/hokum-testnet.js";
 export { godWokenTestnetV1 } from "../chains/chain-definitions/god-woken-testnet-v1.js";
 export { abstractTestnet } from "../chains/chain-definitions/abstract-testnet.js";
+export { abstract } from "../chains/chain-definitions/abstract.js";
 export { assetChainTestnet } from "../chains/chain-definitions/assetchain-testnet.js";
 export { celoAlfajoresTestnet } from "../chains/chain-definitions/celo-alfajores-testnet.js";
 export { fraxtalTestnet } from "../chains/chain-definitions/fraxtal-testnet.js";

package/src/extensions/erc4337/account/isAccountDeployed.ts

@@ -1,3 +1,4 @@
+import { getContract } from "../../../contract/contract.js";
 import type { BaseTransactionOptions } from "../../../transaction/types.js";
 import { isContractDeployed } from "../../../utils/bytecode/is-contract-deployed.js";
 import * as PredictAddress from "../__generated__/IAccountFactory/read/getAddress.js";
@@ -15,10 +16,10 @@ export {
  * ```ts
  * import { isAccountDeployed } from 'thirdweb/extensions/erc4337';
  *
- * const transaction = addAdmin({
+ * const isDeployed = await isAccountDeployed({
  * contract,
  * account,
- * adminAddress: '0x...'
+ * adminSigner: '0x...'
  * });
  *
  * await isAccountDeployed({ contract, adminSigner });
@@ -29,8 +30,10 @@ export async function isAccountDeployed(
   options: BaseTransactionOptions<PredictAddress.GetAddressParams>,
 ): Promise<boolean> {
   const predictedAddress = await PredictAddress.getAddress(options);
-  return isContractDeployed({
-    ...options.contract,
-    address: predictedAddress,
-  });
+  return isContractDeployed(
+    getContract({
+      ...options.contract,
+      address: predictedAddress,
+    }),
+  );
 }

package/src/extensions/erc721/lazyMinting/helpers/hashDelayedRevealBatch.ts

@@ -1,5 +1,6 @@
 import { encodePacked } from "viem/utils";
 import type { ThirdwebContract } from "../../../../contract/contract.js";
+import { getAddress } from "../../../../utils/address.js";
 import { keccak256 } from "../../../../utils/hashing/keccak256.js";
 
 /**
@@ -15,7 +16,7 @@ export const hashDelayedRevealPassword = async (
   return keccak256(
     encodePacked(
       ["string", "uint256", "uint256", "address"],
-      [password, chainId, batchTokenIndex, contractAddress],
+      [password, chainId, batchTokenIndex, getAddress(contractAddress)],
     ),
   );
 };

package/src/react/web/ui/ConnectWallet/Blobbie.tsx

@@ -1,7 +1,6 @@
 "use client";
 import { hexToNumber } from "@noble/curves/abstract/utils";
 import { useId, useMemo } from "react";
-import type { Address } from "viem";
 
 const COLOR_OPTIONS = [
   ["#fca5a5", "#b91c1c"],
@@ -26,7 +25,7 @@ const COLOR_OPTIONS = [
  * @component
  */
 export type BlobbieProps = {
-  address: Address;
+  address: string;
   style?: Omit<React.CSSProperties, "backgroundImage">;
   className?: string;
   size?: number;

package/src/react/web/ui/prebuilt/Wallet/icon.test.tsx

@@ -5,9 +5,8 @@ import { WalletProvider } from "./provider.js";
 
 describe("WalletIcon", () => {
   it("should fetch wallet image", async () => {
-    expect(await fetchWalletImage({ id: "io.metamask" })).toMatchInlineSnapshot(
-      `"data:image/webp;base64,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"`,
-    );
+    const image = await fetchWalletImage({ id: "io.metamask" });
+    expect(image).toContain("data:image/");
   });
 
   it("should throw error if WalletId is not supported", async () => {

package/src/rpc/actions/eth_getLogs.ts

@@ -1,4 +1,3 @@
-import type { Address } from "abitype";
 import {
   type BlockNumber,
   type BlockTag,
@@ -9,6 +8,7 @@ import {
   type RpcLog,
   formatLog,
 } from "viem";
+import { type Address, getAddress } from "../../utils/address.js";
 import { numberToHex } from "../../utils/encoding/hex.js";
 
 export type GetLogsBlockParams =
@@ -75,7 +75,7 @@ export async function eth_getLogs(
   // in the case we have a blockHash
   if (params.blockHash) {
     const param: {
-      address?: string | string[];
+      address?: Address | Address[];
       topics: LogTopic[];
       blockHash: `0x${string}`;
     } = {
@@ -83,7 +83,7 @@ export async function eth_getLogs(
       blockHash: params.blockHash,
     };
     if (params.address) {
-      param.address = params.address;
+      param.address = getAddress(params.address);
     }
     logs = await request({
       method: "eth_getLogs",
@@ -93,7 +93,7 @@ export async function eth_getLogs(
   // otherwise
   else {
     const param: {
-      address?: string | string[];
+      address?: Address | Address[];
       topics?: LogTopic[];
     } & (
       | {

package/src/rpc/actions/eth_getStorageAt.ts

@@ -1,4 +1,5 @@
 import type { BlockTag, EIP1193RequestFn, EIP1474Methods, Hex } from "viem";
+import { getAddress } from "../../utils/address.js";
 
 type GetStorageAtParams = {
   address: string;
@@ -28,6 +29,10 @@ export async function eth_getStorageAt(
 ): Promise<Hex> {
   return await request({
     method: "eth_getStorageAt",
-    params: [params.address, params.position, params.blockTag ?? "latest"],
+    params: [
+      getAddress(params.address),
+      params.position,
+      params.blockTag ?? "latest",
+    ],
   });
 }

package/src/transaction/actions/estimate-gas.ts

@@ -1,6 +1,7 @@
 import * as ox__Hex from "ox/Hex";
 import { formatTransactionRequest } from "viem";
 import { roundUpGas } from "../../gas/op-gas-fee-reducer.js";
+import { getAddress } from "../../utils/address.js";
 import { resolvePromisedValue } from "../../utils/promise/resolve-promised-value.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { Account } from "../../wallets/interfaces/wallet.js";
@@ -117,9 +118,9 @@ export async function estimateGas(
       let gas = await eth_estimateGas(
         rpcRequest,
         formatTransactionRequest({
-          to: toAddress,
+          to: toAddress ? getAddress(toAddress) : undefined,
           data: encodedData,
-          from: fromAddress,
+          from: fromAddress ? getAddress(fromAddress) : undefined,
           value,
           // TODO: Remove this casting when we migrate this file to Ox
           authorizationList: authorizationList?.map((auth) => ({
@@ -127,7 +128,7 @@ export async function estimateGas(
             r: ox__Hex.fromNumber(auth.r),
             s: ox__Hex.fromNumber(auth.s),
             nonce: Number(auth.nonce),
-            contractAddress: auth.address,
+            contractAddress: getAddress(auth.address),
           })),
         }),
       );

package/src/transaction/actions/gasless/providers/biconomy.ts

@@ -2,6 +2,7 @@ import type { Address } from "abitype";
 import { encodeAbiParameters } from "viem";
 import { ZERO_ADDRESS } from "../../../../constants/addresses.js";
 import { getContract } from "../../../../contract/contract.js";
+import { getAddress } from "../../../../utils/address.js";
 import { isHex } from "../../../../utils/encoding/helpers/is-hex.js";
 import { keccak256 } from "../../../../utils/hashing/keccak256.js";
 import { stringify } from "../../../../utils/json.js";
@@ -95,9 +96,9 @@ export async function prepareBiconomyTransaction({
       { type: "bytes32" },
     ],
     [
-      request.from,
-      request.to,
-      request.token,
+      getAddress(request.from),
+      getAddress(request.to),
+      getAddress(request.token),
       request.txGas,
       request.tokenGasPrice,
       request.batchId,

package/src/transaction/actions/simulate.ts

@@ -3,6 +3,7 @@ import { decodeAbiParameters, formatTransactionRequest } from "viem";
 import { eth_call } from "../../rpc/actions/eth_call.js";
 import { getRpcClient } from "../../rpc/rpc.js";
 import type { PreparedMethod } from "../../utils/abi/prepare-method.js";
+import { getAddress } from "../../utils/address.js";
 import { resolvePromisedValue } from "../../utils/promise/resolve-promised-value.js";
 import type { Prettify } from "../../utils/type-utils.js";
 import type { Account } from "../../wallets/interfaces/wallet.js";
@@ -61,8 +62,8 @@ export async function simulateTransaction<
 
   const serializedTx = formatTransactionRequest({
     data,
-    from,
-    to,
+    from: from ? getAddress(from) : undefined,
+    to: to ? getAddress(to) : undefined,
     value,
     accessList,
   });

package/src/transaction/actions/to-serializable-transaction.ts

@@ -91,7 +91,10 @@ export async function toSerializableTransaction(
           ? await import("../../rpc/actions/eth_getTransactionCount.js").then(
               ({ eth_getTransactionCount }) =>
                 eth_getTransactionCount(rpcRequest, {
-                  address: typeof from === "string" ? from : from?.address,
+                  address:
+                    typeof from === "string"
+                      ? getAddress(from)
+                      : getAddress(from.address),
                   blockTag: "pending",
                 }),
             )

package/src/transaction/read-contract.ts

@@ -24,6 +24,7 @@ import {
   type PreparedMethod,
   prepareMethod,
 } from "../utils/abi/prepare-method.js";
+import { getAddress } from "../utils/address.js";
 import type { Hex } from "../utils/encoding/hex.js";
 
 export type ReadContractResult<outputs extends readonly AbiParameter[]> = // if the outputs are 0 length, return never, invalid case
@@ -214,7 +215,7 @@ export async function readContract<
   const result = await eth_call(rpcRequest, {
     data: encodedData,
     to: contract.address,
-    from: options.from,
+    from: options.from ? getAddress(options.from) : undefined,
   });
   // use the prepared method to decode the result
   const decoded = decodeAbiParameters(resolvedPreparedMethod[2], result);

package/src/utils/any-evm/compute-deployment-address.ts

@@ -1,4 +1,5 @@
 import { type Hex, encodePacked } from "viem";
+import { getAddress } from "../address.js";
 import { ensureBytecodePrefix } from "../bytecode/prefix.js";
 import { keccak256 } from "../hashing/keccak256.js";
 import { getSaltHash } from "./get-salt-hash.js";
@@ -46,7 +47,7 @@ export function computeDeploymentAddress(
     ["bytes1", "address", "bytes32", "bytes32"],
     [
       "0xff",
-      options.create2FactoryAddress,
+      getAddress(options.create2FactoryAddress),
       saltHash,
       keccak256(encodePacked(["bytes"], [initBytecode])),
     ],

package/src/utils/bytecode/resolveImplementation.ts

@@ -1,5 +1,5 @@
 import { getBytecode } from "../../contract/actions/get-bytecode.js";
-import type { ThirdwebContract } from "../../contract/contract.js";
+import { type ThirdwebContract, getContract } from "../../contract/contract.js";
 import { eth_getStorageAt } from "../../rpc/actions/eth_getStorageAt.js";
 import { getRpcClient } from "../../rpc/rpc.js";
 import { readContract } from "../../transaction/read-contract.js";
@@ -37,10 +37,12 @@ export async function resolveImplementation(
   if (minimalProxyImplementationAddress) {
     return {
       address: minimalProxyImplementationAddress,
-      bytecode: await getBytecode({
-        ...contract,
-        address: minimalProxyImplementationAddress,
-      }),
+      bytecode: await getBytecode(
+        getContract({
+          ...contract,
+          address: minimalProxyImplementationAddress,
+        }),
+      ),
     };
   }
 
@@ -50,7 +52,10 @@ export async function resolveImplementation(
     // In case of a BeaconProxy, it is setup as BeaconProxy --> Beacon --> Implementation
     // Hence we replace the proxy address with Beacon address, and continue further resolving below
     // biome-ignore lint/style/noParameterAssign: we purposefully mutate the contract object here
-    contract = { ...contract, address: beacon };
+    contract = getContract({
+      ...contract,
+      address: beacon,
+    });
 
     implementationAddress = await getImplementationFromContractCall(contract);
   } else {

package/src/utils/extensions/airdrop/hash-entry-erc1155.ts

@@ -1,4 +1,5 @@
 import { encodePacked } from "viem";
+import { getAddress } from "../../address.js";
 import { keccak256 } from "../../hashing/keccak256.js";
 import type { SnapshotEntryERC1155 } from "./types.js";
 
@@ -9,7 +10,7 @@ export async function hashEntryERC1155(options: {
     encodePacked(
       ["address", "uint256", "uint256"],
       [
-        options.entry.recipient,
+        getAddress(options.entry.recipient),
         BigInt(options.entry.tokenId),
         BigInt(options.entry.amount),
       ],

package/src/utils/extensions/airdrop/hash-entry-erc20.ts

@@ -1,4 +1,5 @@
 import { encodePacked } from "viem";
+import { getAddress } from "../../address.js";
 import { keccak256 } from "../../hashing/keccak256.js";
 import { toUnits } from "../../units.js";
 import type { SnapshotEntryERC20 } from "./types.js";
@@ -13,7 +14,7 @@ export async function hashEntryERC20(options: {
     encodePacked(
       ["address", "uint256"],
       [
-        options.entry.recipient,
+        getAddress(options.entry.recipient),
         convertQuantity({
           quantity: options.entry.amount.toString(),
           tokenDecimals: decimals,

package/src/utils/extensions/airdrop/hash-entry-erc721.ts

@@ -1,4 +1,5 @@
 import { encodePacked } from "viem";
+import { getAddress } from "../../address.js";
 import { keccak256 } from "../../hashing/keccak256.js";
 import type { SnapshotEntryERC721 } from "./types.js";
 
@@ -6,7 +7,7 @@ export async function hashEntryERC721(options: { entry: SnapshotEntryERC721 }) {
   return keccak256(
     encodePacked(
       ["address", "uint256"],
-      [options.entry.recipient, BigInt(options.entry.tokenId)],
+      [getAddress(options.entry.recipient), BigInt(options.entry.tokenId)],
     ),
   );
 }