fixup! feat(sdk): makes chain optional in smart wallet config

Author: gregfromstl

packages/thirdweb/src/wallets/smart/lib/calls.ts

@@ -1,8 +1,9 @@
+import { getCachedChain } from "../../../chains/utils.js";
 import type { Chain } from "../../../chains/types.js";
 import type { ThirdwebClient } from "../../../client/client.js";
 import {
-  type ThirdwebContract,
-  getContract,
+	type ThirdwebContract,
+	getContract,
 } from "../../../contract/contract.js";
 import { prepareContractCall } from "../../../transaction/prepare-contract-call.js";
 import type { PreparedTransaction } from "../../../transaction/prepare-transaction.js";
@@ -28,21 +29,21 @@ import { DEFAULT_ACCOUNT_FACTORY_V0_6 } from "./constants.js";
  * @walletUtils
  */
 export async function predictSmartAccountAddress(args: {
-  client: ThirdwebClient;
-  chain: Chain;
-  adminAddress: string;
-  factoryAddress?: string;
-  accountSalt?: string;
+	client: ThirdwebClient;
+	chain?: Chain;
+	adminAddress: string;
+	factoryAddress?: string;
+	accountSalt?: string;
 }): Promise<string> {
-  return predictAddress({
-    adminAddress: args.adminAddress,
-    accountSalt: args.accountSalt,
-    factoryContract: getContract({
-      address: args.factoryAddress ?? DEFAULT_ACCOUNT_FACTORY_V0_6,
-      chain: args.chain,
-      client: args.client,
-    }),
-  });
+	return predictAddress({
+		adminAddress: args.adminAddress,
+		accountSalt: args.accountSalt,
+		factoryContract: getContract({
+			address: args.factoryAddress ?? DEFAULT_ACCOUNT_FACTORY_V0_6,
+			chain: args.chain ?? getCachedChain(1),
+			client: args.client,
+		}),
+	});
 }
 
 /**
@@ -63,132 +64,132 @@ export async function predictSmartAccountAddress(args: {
  * @deprecated Use `predictSmartAccountAddress` instead.
  */
 export async function predictAddress(args: {
-  factoryContract: ThirdwebContract;
-  predictAddressOverride?: (
-    factoryContract: ThirdwebContract,
-    admin: string,
-  ) => Promise<string>;
-  adminAddress: string;
-  accountSalt?: string;
-  accountAddress?: string;
+	factoryContract: ThirdwebContract;
+	predictAddressOverride?: (
+		factoryContract: ThirdwebContract,
+		admin: string,
+	) => Promise<string>;
+	adminAddress: string;
+	accountSalt?: string;
+	accountAddress?: string;
 }): Promise<string> {
-  const {
-    factoryContract,
-    predictAddressOverride: predictAddress,
-    adminAddress,
-    accountSalt,
-    accountAddress,
-  } = args;
-  if (predictAddress) {
-    return predictAddress(factoryContract, adminAddress);
-  }
-  if (accountAddress) {
-    return accountAddress;
-  }
-  if (!adminAddress) {
-    throw new Error(
-      "Account address is required to predict the smart wallet address.",
-    );
-  }
-  const saltHex =
-    accountSalt && isHex(accountSalt)
-      ? accountSalt
-      : stringToHex(accountSalt ?? "");
-  return readContract({
-    contract: factoryContract,
-    method: "function getAddress(address, bytes) returns (address)",
-    params: [adminAddress, saltHex],
-  });
+	const {
+		factoryContract,
+		predictAddressOverride: predictAddress,
+		adminAddress,
+		accountSalt,
+		accountAddress,
+	} = args;
+	if (predictAddress) {
+		return predictAddress(factoryContract, adminAddress);
+	}
+	if (accountAddress) {
+		return accountAddress;
+	}
+	if (!adminAddress) {
+		throw new Error(
+			"Account address is required to predict the smart wallet address.",
+		);
+	}
+	const saltHex =
+		accountSalt && isHex(accountSalt)
+			? accountSalt
+			: stringToHex(accountSalt ?? "");
+	return readContract({
+		contract: factoryContract,
+		method: "function getAddress(address, bytes) returns (address)",
+		params: [adminAddress, saltHex],
+	});
 }
 
 /**
  * @internal
  */
 export function prepareCreateAccount(args: {
-  factoryContract: ThirdwebContract;
-  adminAddress: string;
-  accountSalt?: string;
-  createAccountOverride?: (
-    factoryContract: ThirdwebContract,
-    admin: string,
-  ) => PreparedTransaction;
+	factoryContract: ThirdwebContract;
+	adminAddress: string;
+	accountSalt?: string;
+	createAccountOverride?: (
+		factoryContract: ThirdwebContract,
+		admin: string,
+	) => PreparedTransaction;
 }): PreparedTransaction {
-  const {
-    adminAddress,
-    factoryContract,
-    createAccountOverride: createAccount,
-    accountSalt,
-  } = args;
-  if (createAccount) {
-    return createAccount(factoryContract, adminAddress);
-  }
-  const saltHex =
-    accountSalt && isHex(accountSalt)
-      ? accountSalt
-      : stringToHex(accountSalt ?? "");
-  return prepareContractCall({
-    contract: factoryContract,
-    method: "function createAccount(address, bytes) returns (address)",
-    params: [adminAddress, saltHex],
-  });
+	const {
+		adminAddress,
+		factoryContract,
+		createAccountOverride: createAccount,
+		accountSalt,
+	} = args;
+	if (createAccount) {
+		return createAccount(factoryContract, adminAddress);
+	}
+	const saltHex =
+		accountSalt && isHex(accountSalt)
+			? accountSalt
+			: stringToHex(accountSalt ?? "");
+	return prepareContractCall({
+		contract: factoryContract,
+		method: "function createAccount(address, bytes) returns (address)",
+		params: [adminAddress, saltHex],
+	});
 }
 
 /**
  * @internal
  */
 export function prepareExecute(args: {
-  accountContract: ThirdwebContract;
-  transaction: SendTransactionOption;
-  executeOverride?: (
-    accountContract: ThirdwebContract,
-    transaction: SendTransactionOption,
-  ) => PreparedTransaction;
+	accountContract: ThirdwebContract;
+	transaction: SendTransactionOption;
+	executeOverride?: (
+		accountContract: ThirdwebContract,
+		transaction: SendTransactionOption,
+	) => PreparedTransaction;
 }): PreparedTransaction {
-  const { accountContract, transaction, executeOverride: execute } = args;
-  if (execute) {
-    return execute(accountContract, transaction);
-  }
-  return prepareContractCall({
-    contract: accountContract,
-    method: "function execute(address, uint256, bytes)",
-    params: [
-      transaction.to || "",
-      transaction.value || 0n,
-      transaction.data || "0x",
-    ],
-    // if gas is specified for the inner tx, use that and add 21k for the execute call on the account contract
-    // this avoids another estimateGas call when bundling the userOp
-    // and also allows for passing custom gas limits for the inner tx
-    gas: transaction.gas ? transaction.gas + 21000n : undefined,
-  });
+	const { accountContract, transaction, executeOverride: execute } = args;
+	if (execute) {
+		return execute(accountContract, transaction);
+	}
+	return prepareContractCall({
+		contract: accountContract,
+		method: "function execute(address, uint256, bytes)",
+		params: [
+			transaction.to || "",
+			transaction.value || 0n,
+			transaction.data || "0x",
+		],
+		// if gas is specified for the inner tx, use that and add 21k for the execute call on the account contract
+		// this avoids another estimateGas call when bundling the userOp
+		// and also allows for passing custom gas limits for the inner tx
+		gas: transaction.gas ? transaction.gas + 21000n : undefined,
+	});
 }
 
 /**
  * @internal
  */
 export function prepareBatchExecute(args: {
-  accountContract: ThirdwebContract;
-  transactions: SendTransactionOption[];
-  executeBatchOverride?: (
-    accountContract: ThirdwebContract,
-    transactions: SendTransactionOption[],
-  ) => PreparedTransaction;
+	accountContract: ThirdwebContract;
+	transactions: SendTransactionOption[];
+	executeBatchOverride?: (
+		accountContract: ThirdwebContract,
+		transactions: SendTransactionOption[],
+	) => PreparedTransaction;
 }): PreparedTransaction {
-  const {
-    accountContract,
-    transactions,
-    executeBatchOverride: executeBatch,
-  } = args;
-  if (executeBatch) {
-    return executeBatch(accountContract, transactions);
-  }
-  return prepareContractCall({
-    contract: accountContract,
-    method: "function executeBatch(address[], uint256[], bytes[])",
-    params: [
-      transactions.map((tx) => tx.to || ""),
-      transactions.map((tx) => tx.value || 0n),
-      transactions.map((tx) => tx.data || "0x"),
-    ],
-  });
+	const {
+		accountContract,
+		transactions,
+		executeBatchOverride: executeBatch,
+	} = args;
+	if (executeBatch) {
+		return executeBatch(accountContract, transactions);
+	}
+	return prepareContractCall({
+		contract: accountContract,
+		method: "function executeBatch(address[], uint256[], bytes[])",
+		params: [
+			transactions.map((tx) => tx.to || ""),
+			transactions.map((tx) => tx.value || 0n),
+			transactions.map((tx) => tx.data || "0x"),
+		],
+	});
 }